From 2d51d628249e8d060fdc8c827639cc97a98594cf Mon Sep 17 00:00:00 2001 From: Pyry Koivisto Date: Fri, 1 Nov 2024 16:06:06 +0200 Subject: [PATCH] AKR:OTR:VKT: Remove (unmaintained, unused) frontend Dockerfiles --- docker-compose-akr.yml | 20 -------------------- docker-compose-otr.yml | 20 -------------------- docker-compose-vkt.yml | 21 --------------------- frontend/Dockerfile.akr | 21 --------------------- frontend/Dockerfile.otr | 21 --------------------- frontend/Dockerfile.vkt | 21 --------------------- frontend/packages/akr/package.json | 1 - frontend/packages/otr/package.json | 1 - frontend/packages/vkt/package.json | 1 - frontend/webpack.common.js | 2 +- 10 files changed, 1 insertion(+), 128 deletions(-) delete mode 100644 frontend/Dockerfile.akr delete mode 100644 frontend/Dockerfile.otr delete mode 100644 frontend/Dockerfile.vkt diff --git a/docker-compose-akr.yml b/docker-compose-akr.yml index 2d439b077..a3fd481d4 100644 --- a/docker-compose-akr.yml +++ b/docker-compose-akr.yml @@ -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 @@ -59,6 +42,3 @@ services: networks: akr-dev: {} - -volumes: - nodemodules: {} diff --git a/docker-compose-otr.yml b/docker-compose-otr.yml index 7c8e9d01b..4a0489f4b 100644 --- a/docker-compose-otr.yml +++ b/docker-compose-otr.yml @@ -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 @@ -60,6 +43,3 @@ services: networks: otr-dev: {} - -volumes: - nodemodules: {} diff --git a/docker-compose-vkt.yml b/docker-compose-vkt.yml index f9f9349c2..9b0fa3e23 100644 --- a/docker-compose-vkt.yml +++ b/docker-compose-vkt.yml @@ -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 @@ -74,6 +56,3 @@ services: networks: vkt-dev: {} - -volumes: - nodemodules: {} diff --git a/frontend/Dockerfile.akr b/frontend/Dockerfile.akr deleted file mode 100644 index 30362f4da..000000000 --- a/frontend/Dockerfile.akr +++ /dev/null @@ -1,21 +0,0 @@ -FROM node:16.16.0-alpine - -RUN corepack enable - -ARG GITHUB_REGISTRY_TOKEN - -# Create app directory -WORKDIR /app/reactjs - -# Copy workspace config -COPY package*.json yarn.lock webpack.common.js ./ -COPY .yarn/releases ./.yarn/releases -COPY .yarn/plugins ./.yarn/plugins -COPY .yarnrc.yml ./ - -# Copy packages -COPY ./packages/akr ./packages/akr - -RUN yarn install - -ENTRYPOINT [ "yarn", "akr:start:docker-compose" ] diff --git a/frontend/Dockerfile.otr b/frontend/Dockerfile.otr deleted file mode 100644 index d89fa02aa..000000000 --- a/frontend/Dockerfile.otr +++ /dev/null @@ -1,21 +0,0 @@ -FROM node:16.16.0-alpine - -RUN corepack enable - -ARG GITHUB_REGISTRY_TOKEN - -# Create app directory -WORKDIR /app/reactjs - -# Copy workspace config -COPY package*.json yarn.lock webpack.common.js ./ -COPY .yarn/releases ./.yarn/releases -COPY .yarn/plugins ./.yarn/plugins -COPY .yarnrc.yml ./ - -# Copy packages -COPY ./packages/otr ./packages/otr - -RUN yarn install - -ENTRYPOINT [ "yarn", "otr:start:docker-compose" ] diff --git a/frontend/Dockerfile.vkt b/frontend/Dockerfile.vkt deleted file mode 100644 index cccb1be37..000000000 --- a/frontend/Dockerfile.vkt +++ /dev/null @@ -1,21 +0,0 @@ -FROM node:16.16.0-alpine - -RUN corepack enable - -ARG GITHUB_REGISTRY_TOKEN - -# Create app directory -WORKDIR /app/reactjs - -# Copy workspace config -COPY package*.json yarn.lock webpack.common.js ./ -COPY .yarn/releases ./.yarn/releases -COPY .yarn/plugins ./.yarn/plugins -COPY .yarnrc.yml ./ - -# Copy packages -COPY ./packages/vkt ./packages/vkt - -RUN yarn install - -ENTRYPOINT [ "yarn", "vkt:start:docker-compose" ] diff --git a/frontend/packages/akr/package.json b/frontend/packages/akr/package.json index c493483a3..8586d6638 100644 --- a/frontend/packages/akr/package.json +++ b/frontend/packages/akr/package.json @@ -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", diff --git a/frontend/packages/otr/package.json b/frontend/packages/otr/package.json index 6983d5d54..e11a96256 100644 --- a/frontend/packages/otr/package.json +++ b/frontend/packages/otr/package.json @@ -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", diff --git a/frontend/packages/vkt/package.json b/frontend/packages/vkt/package.json index 7f720bfd3..4261cdc53 100644 --- a/frontend/packages/vkt/package.json +++ b/frontend/packages/vkt/package.json @@ -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", diff --git a/frontend/webpack.common.js b/frontend/webpack.common.js index ca3c16347..605d3f4cd 100644 --- a/frontend/webpack.common.js +++ b/frontend/webpack.common.js @@ -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,