From 33f6bcedb1aa0dae7ca9797aca83733343dbb851 Mon Sep 17 00:00:00 2001 From: Constantin Simonis Date: Wed, 5 Feb 2025 11:50:23 +0100 Subject: [PATCH 1/9] add Dockerfile --- frontend/.docker/Dockerfile | 9 +++++++++ frontend/docker/docker-compose.yml | 31 ------------------------------ 2 files changed, 9 insertions(+), 31 deletions(-) create mode 100644 frontend/.docker/Dockerfile delete mode 100644 frontend/docker/docker-compose.yml diff --git a/frontend/.docker/Dockerfile b/frontend/.docker/Dockerfile new file mode 100644 index 0000000..ae7f015 --- /dev/null +++ b/frontend/.docker/Dockerfile @@ -0,0 +1,9 @@ +FROM oven/bun:1 AS base +USER root +WORKDIR /usr/src/app + +COPY .. /usr/src/app +RUN bun install + +EXPOSE 3000/tcp +ENTRYPOINT [ "bun", "start" ] diff --git a/frontend/docker/docker-compose.yml b/frontend/docker/docker-compose.yml deleted file mode 100644 index a83a1d8..0000000 --- a/frontend/docker/docker-compose.yml +++ /dev/null @@ -1,31 +0,0 @@ -version: '3' - -volumes: - employee_postgres_data: - driver: local - -services: - postgres-employee: - container_name: postgres_employee - image: postgres:13.3 - volumes: - - employee_postgres_data:/var/lib/postgresql/data - environment: - POSTGRES_DB: employee_db - POSTGRES_USER: employee - POSTGRES_PASSWORD: secret - ports: - - "5432:5432" - - employee: - container_name: employee - image: berndheidemann/employee-management-service:1.0.4 - # image: berndheidemann/employee-management-service_without_keycloak:1.1 - environment: - spring.datasource.url: jdbc:postgresql://postgres-employee:5432/employee_db - spring.datasource.username: employee - spring.datasource.password: secret - ports: - - "8089:8089" - depends_on: - - postgres-employee -- 2.47.2 From 39dcae3a815bcfc5f009908c77ff53babf4d2dda Mon Sep 17 00:00:00 2001 From: Constantin Simonis Date: Wed, 5 Feb 2025 11:52:46 +0100 Subject: [PATCH 2/9] add workflow --- .gitea/workflows/build.yaml | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 .gitea/workflows/build.yaml diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml new file mode 100644 index 0000000..646222d --- /dev/null +++ b/.gitea/workflows/build.yaml @@ -0,0 +1,25 @@ +name: Build and push Docker image +on: push +# pull_request: +# types: +# - closed +# branches: +# - main +jobs: + build: + runs-on: remote + steps: + - name: Checkout + uses: https://git.simonis.lol/actions/checkout@v4 + + - name: Build + run: docker buildx build -f .docker/Dockerfile -t git.simonis.lol/projects/casino-frontend:latest . + + - name: Login + uses: https://git.simonis.lol/actions/login@v1 + with: + registry: git.simonis.lol + username: ${{ vars.DOCKER_USER }} + password: ${{ vars.DOCKER_PW }} + - name: Push + run: docker push git.simonis.lol/projects/casino-frontend:latest -- 2.47.2 From 8ac21ec36291e7e33f99e48a0d2e806e7b9a5907 Mon Sep 17 00:00:00 2001 From: Constantin Simonis Date: Wed, 5 Feb 2025 11:55:00 +0100 Subject: [PATCH 3/9] fix --- .gitea/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 646222d..0eab542 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -13,7 +13,7 @@ jobs: uses: https://git.simonis.lol/actions/checkout@v4 - name: Build - run: docker buildx build -f .docker/Dockerfile -t git.simonis.lol/projects/casino-frontend:latest . + run: docker buildx build -f frontend/.docker/Dockerfile -t git.simonis.lol/projects/casino-frontend:latest . - name: Login uses: https://git.simonis.lol/actions/login@v1 -- 2.47.2 From db7bf1411366f6e531390558f133816b8545f56a Mon Sep 17 00:00:00 2001 From: Constantin Simonis Date: Wed, 5 Feb 2025 12:08:13 +0100 Subject: [PATCH 4/9] fix --- .gitea/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 0eab542..a613870 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -13,7 +13,7 @@ jobs: uses: https://git.simonis.lol/actions/checkout@v4 - name: Build - run: docker buildx build -f frontend/.docker/Dockerfile -t git.simonis.lol/projects/casino-frontend:latest . + run: docker buildx build -f frontend/.docker/Dockerfile -t git.simonis.lol/projects/casino-frontend:latest frontend - name: Login uses: https://git.simonis.lol/actions/login@v1 -- 2.47.2 From 9990cba51766f5c74da028adbce1c64ab4582674 Mon Sep 17 00:00:00 2001 From: Constantin Simonis Date: Wed, 5 Feb 2025 12:10:32 +0100 Subject: [PATCH 5/9] fix --- .gitea/workflows/build.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index a613870..c9ab9b0 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -21,5 +21,6 @@ jobs: registry: git.simonis.lol username: ${{ vars.DOCKER_USER }} password: ${{ vars.DOCKER_PW }} + - name: Push run: docker push git.simonis.lol/projects/casino-frontend:latest -- 2.47.2 From 843129590ccda3b5cba80d022dac36a4ca0fd06e Mon Sep 17 00:00:00 2001 From: Constantin Simonis Date: Wed, 5 Feb 2025 12:11:59 +0100 Subject: [PATCH 6/9] test --- .gitea/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index c9ab9b0..ddab967 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -13,7 +13,7 @@ jobs: uses: https://git.simonis.lol/actions/checkout@v4 - name: Build - run: docker buildx build -f frontend/.docker/Dockerfile -t git.simonis.lol/projects/casino-frontend:latest frontend + run: docker buildx build -f frontend/.docker/Dockerfile -t git.simonis.lol/projects/casino:frontend-latest frontend - name: Login uses: https://git.simonis.lol/actions/login@v1 -- 2.47.2 From 0ca780f4aa68c43e9f361e1f0a3c338bc00f3f9b Mon Sep 17 00:00:00 2001 From: Constantin Simonis Date: Wed, 5 Feb 2025 12:20:37 +0100 Subject: [PATCH 7/9] some1 kill me ffs --- .gitea/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index ddab967..301059e 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -23,4 +23,4 @@ jobs: password: ${{ vars.DOCKER_PW }} - name: Push - run: docker push git.simonis.lol/projects/casino-frontend:latest + run: docker push git.simonis.lol/projects/casino:frontend-latest -- 2.47.2 From 53d1b68341266b55abcb698c5024055b6b602777 Mon Sep 17 00:00:00 2001 From: Constantin Simonis Date: Wed, 5 Feb 2025 12:39:53 +0100 Subject: [PATCH 8/9] test --- frontend/.docker/Dockerfile | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/frontend/.docker/Dockerfile b/frontend/.docker/Dockerfile index ae7f015..aa0065f 100644 --- a/frontend/.docker/Dockerfile +++ b/frontend/.docker/Dockerfile @@ -1,9 +1,16 @@ -FROM oven/bun:1 AS base -USER root -WORKDIR /usr/src/app +FROM oven/bun:latest AS build -COPY .. /usr/src/app -RUN bun install +WORKDIR /app -EXPOSE 3000/tcp -ENTRYPOINT [ "bun", "start" ] +ENV NODE_ENV=production +COPY .. . +RUN bun install --prod + +FROM oven/bun:latest AS production + +WORKDIR /app + +RUN bun install --prod + +EXPOSE 3001 +CMD ["bun", "start", "-p", "3001"] -- 2.47.2 From 4d8f7391eab8b7c85a49c74fdfb9fca023d4ea37 Mon Sep 17 00:00:00 2001 From: Constantin Simonis Date: Wed, 5 Feb 2025 14:38:58 +0100 Subject: [PATCH 9/9] maybe fix --- frontend/.docker/Dockerfile | 11 +++++------ frontend/.dockerignore | 5 +++++ frontend/package.json | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) create mode 100644 frontend/.dockerignore diff --git a/frontend/.docker/Dockerfile b/frontend/.docker/Dockerfile index aa0065f..6d7aeb2 100644 --- a/frontend/.docker/Dockerfile +++ b/frontend/.docker/Dockerfile @@ -1,16 +1,15 @@ FROM oven/bun:latest AS build - WORKDIR /app ENV NODE_ENV=production + COPY .. . RUN bun install --prod +RUN bun run build -FROM oven/bun:latest AS production - +FROM oven/bun:latest AS prod WORKDIR /app -RUN bun install --prod +COPY --from=build /app /app -EXPOSE 3001 -CMD ["bun", "start", "-p", "3001"] +CMD ["bun", "run", "start"] diff --git a/frontend/.dockerignore b/frontend/.dockerignore new file mode 100644 index 0000000..97e8899 --- /dev/null +++ b/frontend/.dockerignore @@ -0,0 +1,5 @@ +.angular +node_modules +dist +.git +.docker diff --git a/frontend/package.json b/frontend/package.json index 962c3f0..0e1c9e8 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -4,7 +4,7 @@ "scripts": { "ng": "bunx @angular/cli", "start": "bunx @angular/cli serve --proxy-config src/proxy.conf.json", - "build": "bunx @angular/cli build", + "build": "bunx @angular/cli build --no-watch", "watch": "bunx @angular/cli build --watch --configuration development", "test": "bunx @angular/cli test", "format": "prettier --write \"src/**/*.{ts,html,css,scss}\"", -- 2.47.2