From 659930118668dc671f3e7ad1983ab13a468e564d Mon Sep 17 00:00:00 2001 From: Mrugesh Mohapatra Date: Sun, 27 Sep 2020 23:46:10 +0530 Subject: [PATCH] chore: remove docker scripts, config, etc. --- Dockerfile.tests | 2 - docker-compose-shared.yml | 20 ------- docker-compose.tests.yml | 44 ---------------- docker-compose.yml | 107 -------------------------------------- package.json | 9 ---- sample.env | 3 -- 6 files changed, 185 deletions(-) delete mode 100644 Dockerfile.tests delete mode 100755 docker-compose-shared.yml delete mode 100644 docker-compose.tests.yml delete mode 100644 docker-compose.yml diff --git a/Dockerfile.tests b/Dockerfile.tests deleted file mode 100644 index d288e269fd..0000000000 --- a/Dockerfile.tests +++ /dev/null @@ -1,2 +0,0 @@ -FROM node:lts -RUN apt-get update && apt-get install -y --no-install-recommends gconf-service libasound2 libatk1.0-0 libc6 libcairo2 libcups2 libdbus-1-3 libexpat1 libfontconfig1 libgcc1 libgconf-2-4 libgdk-pixbuf2.0-0 libglib2.0-0 libgtk-3-0 libnspr4 libpango-1.0-0 libpangocairo-1.0-0 libstdc++6 libx11-6 libx11-xcb1 libxcb1 libxcomposite1 libxcursor1 libxdamage1 libxext6 libxfixes3 libxi6 libxrandr2 libxrender1 libxss1 libxtst6 ca-certificates fonts-liberation libappindicator1 libnss3 lsb-release xdg-utils wget diff --git a/docker-compose-shared.yml b/docker-compose-shared.yml deleted file mode 100755 index 962b79b35e..0000000000 --- a/docker-compose-shared.yml +++ /dev/null @@ -1,20 +0,0 @@ -# Docker Compose override file for freeCodeCamp -# -# Run with: -# docker-compose -f docker-compose.yml -f docker-compose-shared.yml up -# -version: "3" -services: - db: - networks: - - shared - mailhog: - networks: - - shared - freecodecamp: - networks: - - shared - -networks: # Used by other projects like open-api - shared: - driver: bridge diff --git a/docker-compose.tests.yml b/docker-compose.tests.yml deleted file mode 100644 index 10202b6c2b..0000000000 --- a/docker-compose.tests.yml +++ /dev/null @@ -1,44 +0,0 @@ -# Docker Compose file for FreeCodeCamp tests -# -# Before run tests, bootstrap project with commands from a docker-compose.yml -# -# Bootstrap with: -# npm run docker:test:init -# -# Note, bootstrap takes a long time. -# -# Run with: -# npm run docker:test -- -c "npm run test" -# or -# npm run docker:test -- -c "npm run test:curriculum" -# npm run docker:test -- -c "npm run test:client" -# npm run docker:test -- -c "npm run test:server" -# -# If need to test one challenge: -# npm run docker:test -- -c "cd curriculum && npm run test -- -f 'Title of Challenge'" -# -version: '3' -services: - tests: - build: - context: . - dockerfile: Dockerfile.tests - volumes: - - .:/app:delegated - - node_modules:/app/node_modules:delegated - - client_node_modules:/app/client/node_modules:delegated - - server_node_modules:/app/api-server/node_modules:delegated - - curriculum_node_modules:/app/curriculum/node_modules:delegated - - challenge_md_parser_node_modules:/app/tools/challenge-md-parser/node_modules:delegated - - seed_node_modules:/app/tools/scripts/seed/node_modules:delegated - - client_plugin_nav_data_node_modules:/app/client/plugins/fcc-create-nav-data/node_modules:delegated - working_dir: /app - -volumes: - node_modules: - client_node_modules: - server_node_modules: - curriculum_node_modules: - challenge_md_parser_node_modules: - seed_node_modules: - client_plugin_nav_data_node_modules: diff --git a/docker-compose.yml b/docker-compose.yml deleted file mode 100644 index 07cda6ca57..0000000000 --- a/docker-compose.yml +++ /dev/null @@ -1,107 +0,0 @@ -# Docker Compose file for FreeCodeCamp -# -# If using Docker Toolbox, set `DOCKER_HOST_LOCATION` env var to output from -# `docker-machine ip` -# -# Bootstrap with: -# npm run docker:init -# npm run docker:install -# npm run docker:seed -# -# Run with: -# npm run docker:develop -# -# If plan to make a contribution to the project then install root node_modules -# with: -# npm ci --ignore-scripts -# -version: '3' -services: - freecodecamp: - image: node:lts - user: node - depends_on: - - db - - mailhog - environment: - - MAILHOG_HOST=mailhog - - MONGOHQ_URL=mongodb://db:27017/freecodecamp - volumes: - - .:/app:delegated - - node_modules:/app/node_modules:delegated - - client_node_modules:/app/client/node_modules:delegated - - server_node_modules:/app/api-server/node_modules:delegated - - curriculum_node_modules:/app/curriculum/node_modules:delegated - - challenge_md_parser_node_modules:/app/tools/challenge-md-parser/node_modules:delegated - - seed_node_modules:/app/tools/scripts/seed/node_modules:delegated - - client_plugin_nav_data_node_modules:/app/client/plugins/fcc-create-nav-data/node_modules:delegated - working_dir: /app - client: - image: node:lts - user: node - environment: - - API_PROXY=http://api-server:3000 - - GATSBY_WEBPACK_PUBLICPATH=http://$DOCKER_HOST_LOCATION:8000/ - - HOME_LOCATION=http://$DOCKER_HOST_LOCATION:8000 - - API_LOCATION=http://$DOCKER_HOST_LOCATION:3000 - volumes: - - .:/app:delegated - - node_modules:/app/node_modules:delegated - - client_node_modules:/app/client/node_modules:delegated - - server_node_modules:/app/api-server/node_modules:delegated - - curriculum_node_modules:/app/curriculum/node_modules:delegated - - challenge_md_parser_node_modules:/app/tools/challenge-md-parser/node_modules:delegated - - seed_node_modules:/app/tools/scripts/seed/node_modules:delegated - - client_plugin_nav_data_node_modules:/app/client/plugins/fcc-create-nav-data/node_modules:delegated - working_dir: /app/client - command: npm run develop -- -H '0.0.0.0' - ports: - - '8000:8000' - - '9228:9228' - api-server: - image: node:lts - user: node - depends_on: - - db - - mailhog - environment: - - MAILHOG_HOST=mailhog - - MONGOHQ_URL=mongodb://db:27017/freecodecamp - - COOKIE_DOMAIN=$DOCKER_HOST_LOCATION - - HOME_LOCATION=http://$DOCKER_HOST_LOCATION:8000 - - API_LOCATION=http://$DOCKER_HOST_LOCATION:3000 - volumes: - - .:/app:delegated - - node_modules:/app/node_modules:delegated - - client_node_modules:/app/client/node_modules:delegated - - server_node_modules:/app/api-server/node_modules:delegated - - curriculum_node_modules:/app/curriculum/node_modules:delegated - - challenge_md_parser_node_modules:/app/tools/challenge-md-parser/node_modules:delegated - - seed_node_modules:/app/tools/scripts/seed/node_modules:delegated - - client_plugin_nav_data_node_modules:/app/client/plugins/fcc-create-nav-data/node_modules:delegated - working_dir: /app/api-server - command: npm run develop - ports: - - '3000:3000' - - '9229:9229' - db: - image: mongo:3.6 - ports: - - '27016:27017' - volumes: - - dbdata:/data/db - mailhog: - image: mailhog/mailhog - ports: - - '1025:1025' - - '8025:8025' - -volumes: - dbdata: - node_modules: - client_node_modules: - server_node_modules: - curriculum_node_modules: - challenge_md_parser_node_modules: - seed_node_modules: - client_plugin_nav_data_node_modules: diff --git a/package.json b/package.json index 301b7d2239..729f473277 100644 --- a/package.json +++ b/package.json @@ -26,15 +26,6 @@ "develop": "npm-run-all ensure-env -p develop:*", "develop:client": "cd ./client && npm run develop", "develop:server": "cd ./api-server && npm run develop", - "develop:docs": "docsify serve ./docs --port 3200", - "docker:run-once": "npm run docker:init && npm run docker:install && npm run docker:seed", - "docker:clean": "docker-compose run -u root --rm freecodecamp bash -c \"rm -rf **/node_modules/* **/node_modules/..?* **/node_modules/.[!.]* node_modules/* node_modules/..?* node_modules/.[!.]*\"", - "docker:develop": "docker-compose up client api-server", - "docker:init": "docker-compose run -u root --rm freecodecamp bash change_volumes_owner.sh && docker-compose run -u root --rm client bash -c \"cd .. && bash change_volumes_owner.sh\" && docker-compose run -u root --rm api-server bash -c \"cd .. && bash change_volumes_owner.sh\"", - "docker:install": "docker-compose run --rm freecodecamp npm ci", - "docker:seed": "docker-compose run --rm freecodecamp npm run seed", - "docker:test": "docker-compose -f docker-compose.tests.yml run --rm tests bash", - "docker:test:init": "docker-compose -f docker-compose.tests.yml run -u root --rm tests bash change_volumes_owner.sh", "docs:serve": "docsify serve ./docs -o --port 3200", "ensure-env": "cross-env DEBUG=fcc:* node ./tools/scripts/build/ensure-env.js", "e2e:dev:watch": "start-test develop ':3000/status/ping|8000' cypress:dev:watch", diff --git a/sample.env b/sample.env index 4e41159865..efdfe71814 100644 --- a/sample.env +++ b/sample.env @@ -66,6 +66,3 @@ DEBUG=true LOCAL_MOCK_AUTH=true # Webhook proxy url from smee.io for PayPal WEBHOOK_PROXY_URL='' -# Docker Setup -DOCKER_HOST_LOCATION=localhost -COMPOSE_PROJECT_NAME=freecodecamp