From 697e41a311572c14cb201dd514de726aba80b895 Mon Sep 17 00:00:00 2001
From: Muhammad Raihan Akbar <ianakbar711@gmail.com>
Date: Sun, 9 Mar 2025 12:27:32 +0700
Subject: [PATCH] [REFACTOR] Removed build args, instead will provide env vars
on docker-compose configuration
---
.github/workflows/staging-ci-cd.yml | 2 +-
Dockerfile | 17 -----------------
2 files changed, 1 insertion(+), 18 deletions(-)
diff --git a/.github/workflows/staging-ci-cd.yml b/.github/workflows/staging-ci-cd.yml
index 3d0679e..b35de49 100644
--- a/.github/workflows/staging-ci-cd.yml
+++ b/.github/workflows/staging-ci-cd.yml
@@ -88,5 +88,5 @@ jobs:
run: export DOCKER_BUILDKIT=1
- name: Build Docker Image
run: |
- docker build --build-arg PRODUCTION=$staging --build-arg JDBC_STAGING_DATABASE_PASSWORD=${{ secrets.JDBC_STAGING_DATABASE_PASSWORD }} --build-arg JDBC_STAGING_DATABASE_URL=${{ secrets.JDBC_STAGING_DATABASE_URL }} --build-arg JDBC_STAGING_DATABASE_USERNAME=${{ secrets.JDBC_STAGING_DATABASE_USERNAME }} -t ${{ secrets.REGISTRY_USER }}/${{ secrets.IMAGE_NAME }}:${{ secrets.IMAGE_TAG }} .
+ docker build -t ${{ secrets.REGISTRY_USER }}/${{ secrets.IMAGE_NAME }}:${{ secrets.IMAGE_TAG }} .
docker push ${{ secrets.REGISTRY_USER }}/${{ secrets.IMAGE_NAME }}:${{ secrets.IMAGE_TAG }}
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index 567af37..19f626a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,22 +1,5 @@
FROM openjdk:21-jdk-slim
-# Setup envs
-ARG PRODUCTION
-ARG JDBC_DATABASE_PASSWORD
-ARG JDBC_DATABASE_URL
-ARG JDBC_DATABASE_USERNAME
-ARG JDBC_STAGING_DATABASE_USERNAME
-ARG JDBC_STAGING_DATABASE_URL
-ARG JDBC_STAGING_DATABASE_URL
-
-ENV PRODUCTION ${PRODUCTION}
-ENV JDBC_DATABASE_PASSWORD ${JDBC_DATABASE_PASSWORD}
-ENV JDBC_DATABASE_URL ${JDBC_DATABASE_URL}
-ENV JDBC_DATABASE_USERNAME ${JDBC_DATABASE_USERNAME}
-ENV JDBC_STAGING_DATABASE_PASSWORD ${JDBC_STAGING_DATABASE_PASSWORD}
-ENV JDBC_STAGING_DATABASE_URL ${JDBC_STAGING_DATABASE_URL}
-ENV JDBC_STAGING_DATABASE_USERNAME ${JDBC_STAGING_DATABASE_USERNAME}
-
WORKDIR /app
COPY *.jar app.jar
EXPOSE 8080
--
GitLab