-
-
Notifications
You must be signed in to change notification settings - Fork 494
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update docker labels, production docker-compose and simple fixes. (#824)
* Fix docker build error for Web and update docs * Update docker labels and add required args in docker-compose * Update production docker-compose configuration * revert passing args in docker-compose config
- Loading branch information
Showing
9 changed files
with
99 additions
and
82 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,40 +1,59 @@ | ||
| version: "3" | ||
| services: | ||
| bassa-api: | ||
| build: components/core/ | ||
| api: | ||
| build: | ||
| context: components/core/ | ||
| dockerfile: Dockerfile.prod | ||
| container_name: api | ||
| ports: | ||
| - 5000:5000 | ||
| depends_on: | ||
| links: | ||
| - db | ||
| volumes: | ||
| - ./downloads:/downloads | ||
| environment: | ||
| BASSA_DB_NAME: ${BASSA_DB_NAME} | ||
| BASSA_DB_USERNAME: ${BASSA_DB_USERNAME} | ||
| BASSA_DB_PASSWORD: ${BASSA_DB_PASSWORD} | ||
| labels: | ||
| com.example.description: "Docker container for Bassa Backend" | ||
| BASSA_DB_NAME: Bassa | ||
| BASSA_DB_USERNAME: bassa | ||
| BASSA_DB_PASSWORD: bassa@1234 | ||
|
|
||
| web: | ||
| build: ui/ | ||
| build: | ||
| context: ui/ | ||
| dockerfile: Dockerfile | ||
| container_name: web | ||
| ports: | ||
| - 3000:80 | ||
| - 80:80 | ||
| links: | ||
| - api | ||
| depends_on: | ||
| - db | ||
| labels: | ||
| com.example.description: "Docker container for Bassa UI" | ||
|
|
||
| aria2c: | ||
| build: components/aria2c/ | ||
| container_name: aria2c | ||
| links: | ||
| - api | ||
| ports: | ||
| - 6800:6800 | ||
| volumes: | ||
| - ./downloads:/data | ||
| restart: always | ||
|
|
||
| db: | ||
| image: mysql | ||
| image: mysql:5.7 | ||
| restart: always | ||
| volumes: | ||
| - data-volume:/var/lib/mysql | ||
| - data-volume:/var/lib/mysql | ||
| - ./.docker/volumes/mysql:/docker-entrypoint-initdb.d | ||
| - ./db_schema/:/tmp/schema | ||
| - ./db_schema/:/tmp/schema/ | ||
| ports: | ||
| - 3306:3306 | ||
| environment: | ||
| MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD} | ||
| MYSQL_DATABASE: ${BASSA_DB_NAME} | ||
| MYSQL_USER: ${BASSA_DB_USERNAME} | ||
| MYSQL_PASSWORD: ${BASSA_DB_PASSWORD} | ||
| BASSA_DB_NAME: ${BASSA_DB_NAME} | ||
| MYSQL_ROOT_PASSWORD: bassa@1234 | ||
| MYSQL_DATABASE: Bassa | ||
| MYSQL_USER: bassa | ||
| MYSQL_PASSWORD: bassa@1234 | ||
| BASSA_DB_NAME: Bassa | ||
|
|
||
| volumes: | ||
| data-volume: |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -9,3 +9,4 @@ README.md | |
| # This should contain all files created during `npm run build`. | ||
| build | ||
| node_modules | ||
| package-lock.json | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| FROM node:8-alpine | ||
| FROM node:7 | ||
|
|
||
| MAINTAINER SCoRe Lab Community <[email protected]> | ||
|
|
||
|
|
@@ -13,21 +13,22 @@ COPY . . | |
| # Exposing port for accessing the web interface | ||
| EXPOSE 3000 | ||
|
|
||
| # Installing node modules | ||
| RUN apk update && \ | ||
| # Installing node modules and bower modules | ||
| RUN apt-get update && \ | ||
| npm install && \ | ||
| npm install --global bower gulp-cli | ||
| npm install --global bower gulp-cli && \ | ||
| bower --allow-root install | ||
|
|
||
| # Starting gulp server | ||
| CMD ["gulp", "serve"] | ||
|
|
||
| # labels to dockerfile | ||
| LABEL multi.org.label-schema.name="Bassa" \ | ||
| multi.org.label-schema.description="Bassa provides Automated Download Queue to make the best use of Internet bandwidth" \ | ||
| multi.org.label-schema.url="https://github.com/scorelab/Bassa/wiki" \ | ||
| multi.org.label-schema.vcs-url="https://github.com/scorelab/Bassa" \ | ||
| multi.org.label-schema.vcs-ref=$VCS_REF \ | ||
| multi.org.label-schema.build-date=$BUILD_DATE \ | ||
| multi.org.label-schema.vendor="Sustainable Computing Research Group" \ | ||
| multi.org.label-schema.version="" \ | ||
| multi.org.label-schema.schema-version="1.0" | ||
| LABEL scorelab.bassa.name="Bassa Web development server" \ | ||
| scorelab.bassa.description="Dockerfile for Bassa Web" \ | ||
| scorelab.bassa.url="https://github.com/scorelab/Bassa/wiki" \ | ||
| scorelab.bassa.vcs-url="https://github.com/scorelab/Bassa" \ | ||
| scorelab.bassa.vcs-ref=$VCS_REF \ | ||
| scorelab.bassa.build-date=$BUILD_DATE \ | ||
| scorelab.bassa.vendor="Sustainable Computing Research Group" \ | ||
| scorelab.bassa.version="1.0" \ | ||
| scorelab.bassa.schema-version="1.0" | ||