Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

AKR:OTR:VKT: Remove (unmaintained, unused) frontend Dockerfiles #750

Merged
merged 1 commit into from
Nov 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 0 additions & 20 deletions docker-compose-akr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,23 +27,6 @@ services:
- SPRING_DATASOURCE_PASSWORD=postgres
- SERVER_PORT=8080
- AKR_UNSECURE=${AKR_UNSECURE}
akr-frontend:
build:
context: ./frontend
dockerfile: Dockerfile.akr
args:
- GITHUB_REGISTRY_TOKEN=${GITHUB_REGISTRY_TOKEN}
ports:
- "4000:4000"
working_dir: /app/reactjs
networks:
- akr-dev
volumes:
- ./frontend/packages/akr:/app/reactjs/packages/akr
- /app/reactjs/node_modules
- /app/reactjs/packages/akr/node_modules
environment:
- GITHUB_REGISTRY_TOKEN=${GITHUB_REGISTRY_TOKEN}

akr-postgres:
build: ./backend/akr/db
Expand All @@ -59,6 +42,3 @@ services:

networks:
akr-dev: {}

volumes:
nodemodules: {}
20 changes: 0 additions & 20 deletions docker-compose-otr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,23 +27,6 @@ services:
- SPRING_DATASOURCE_PASSWORD=postgres
- SERVER_PORT=8081
- OTR_UNSECURE=${OTR_UNSECURE}
otr-frontend:
build:
context: ./frontend
dockerfile: Dockerfile.otr
args:
- GITHUB_REGISTRY_TOKEN=${GITHUB_REGISTRY_TOKEN}
ports:
- "4001:4001"
working_dir: /app/reactjs
networks:
- otr-dev
volumes:
- ./frontend/packages/otr:/app/reactjs/packages/otr
- /app/reactjs/node_modules
- /app/reactjs/packages/otr/node_modules
environment:
- GITHUB_REGISTRY_TOKEN=${GITHUB_REGISTRY_TOKEN}

otr-postgres:
build: ./backend/otr/db
Expand All @@ -60,6 +43,3 @@ services:

networks:
otr-dev: {}

volumes:
nodemodules: {}
21 changes: 0 additions & 21 deletions docker-compose-vkt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,24 +29,6 @@ services:
- SERVER_PORT=8082
- VKT_UNSECURE=${VKT_UNSECURE}

vkt-frontend:
build:
context: ./frontend
dockerfile: Dockerfile.vkt
args:
- GITHUB_REGISTRY_TOKEN=${GITHUB_REGISTRY_TOKEN}
ports:
- "4002:4002"
working_dir: /app/reactjs
networks:
- vkt-dev
volumes:
- ./frontend/packages/vkt:/app/reactjs/packages/vkt
- /app/reactjs/node_modules
- /app/reactjs/packages/vkt/node_modules
environment:
- GITHUB_REGISTRY_TOKEN=${GITHUB_REGISTRY_TOKEN}

vkt-postgres:
build: ./backend/vkt/db
container_name: vkt-postgres
Expand Down Expand Up @@ -74,6 +56,3 @@ services:

networks:
vkt-dev: {}

volumes:
nodemodules: {}
21 changes: 0 additions & 21 deletions frontend/Dockerfile.akr

This file was deleted.

21 changes: 0 additions & 21 deletions frontend/Dockerfile.otr

This file was deleted.

21 changes: 0 additions & 21 deletions frontend/Dockerfile.vkt

This file was deleted.

1 change: 0 additions & 1 deletion frontend/packages/akr/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
"akr:qa": "yarn akr:lint && yarn akr:format && yarn akr:test:jest && yarn akr:start:ci",
"akr:start": "yarn g:webpack serve --config webpack.config.js --env proxy=http://localhost:8080",
"akr:start:ci": "yarn g:webpack serve --env cypress --config webpack.config.js --no-open",
"akr:start:docker-compose": "yarn g:webpack serve --config webpack.config.js --env proxy=http://akr-backend:8080 --env docker",
"akr:stylelint": "yarn g:stylelint --fix \"./src/**/*.scss\"",
"akr:test:cypress": "TZ=Europe/Helsinki yarn g:cypress run",
"akr:test:cypress:open": "TZ=Europe/Helsinki yarn g:cypress open",
Expand Down
1 change: 0 additions & 1 deletion frontend/packages/otr/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
"otr:qa": "yarn otr:lint && yarn otr:format && yarn otr:test:jest && yarn otr:start:ci",
"otr:start": "yarn g:webpack serve --config webpack.config.js --env proxy=http://localhost:8081",
"otr:start:ci": "yarn g:webpack serve --env cypress --config webpack.config.js --no-open",
"otr:start:docker-compose": "yarn g:webpack serve --config webpack.config.js --env proxy=http://otr-backend:8081 --env docker",
"otr:stylelint": "yarn g:stylelint --fix \"./src/**/*.scss\"",
"otr:test:cypress": "TZ=Europe/Helsinki yarn g:cypress run",
"otr:test:cypress:open": "TZ=Europe/Helsinki yarn g:cypress open",
Expand Down
1 change: 0 additions & 1 deletion frontend/packages/vkt/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
"vkt:qa": "yarn vkt:lint && yarn vkt:format && yarn vkt:test:jest && yarn vkt:start:ci",
"vkt:start": "yarn g:webpack serve --config webpack.config.js --env proxy=http://localhost:8082",
"vkt:start:ci": "yarn g:webpack serve --env cypress --env prod --config webpack.config.js --no-open --no-client-overlay",
"vkt:start:docker-compose": "yarn g:webpack serve --config webpack.config.js --env proxy=http://vkt-backend:8082 --env docker",
"vkt:stylelint": "yarn g:stylelint --fix \"./src/**/*.scss\"",
"vkt:test:cypress": "TZ=Europe/Helsinki yarn g:cypress run",
"vkt:test:cypress:open": "TZ=Europe/Helsinki yarn g:cypress open",
Expand Down
2 changes: 1 addition & 1 deletion frontend/webpack.common.js
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ const getHtmlWebpackPlugin = (env, appName, dirName) => {
},
};

if ((!env.docker || !env.cypress) && isGitAvailable()) {
if (!env.cypress && isGitAvailable()) {
const { GitRevisionPlugin } = require("git-revision-webpack-plugin");
const gitRevisionPlugin = new GitRevisionPlugin({
branch: true,
Expand Down
Loading