Skip to content

Commit c492eec

Browse files
committed
Update Workflows
1 parent 64770f9 commit c492eec

File tree

2 files changed

+13
-4
lines changed

2 files changed

+13
-4
lines changed

.github/workflows/deploy.yml

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,12 @@ jobs:
5454
set -euo pipefail
5555
IMAGE_TAG_VALUE=""
5656
if [ "${EVENT_NAME}" = "workflow_dispatch" ]; then
57-
IMAGE_TAG_VALUE="${GITHUB_SHA:0:12}"
57+
IMAGE_TAG_VALUE="latest"
5858
else
5959
if [[ "${HEAD_BRANCH:-}" =~ ^v([0-9]+)\.([0-9]+)\.([0-9]+)$ ]]; then
6060
IMAGE_TAG_VALUE="${HEAD_BRANCH#v}"
61+
elif [ "${HEAD_BRANCH:-}" = "main" ]; then
62+
IMAGE_TAG_VALUE="latest"
6163
else
6264
IMAGE_TAG_VALUE="${HEAD_SHA:0:12}"
6365
fi
@@ -90,6 +92,7 @@ jobs:
9092
cp -vr monitoring/grafana/provisioning/* deploy_bundle/monitoring/grafana/provisioning/ 2>/dev/null || true
9193
9294
mkdir -p ops
95+
9396
cat > ops/deploy.sh <<'EOS'
9497
#!/usr/bin/env bash
9598
set -euo pipefail
@@ -101,9 +104,15 @@ jobs:
101104
# Backup .env
102105
cp -f .env ".env.bak.$(date +%Y%m%d-%H%M%S)" || true
103106
104-
# Ghi IMAGE_TAG vào .env
107+
# Ghi IMAGE_TAG vào .env:
108+
# - nếu IMAGE_TAG=latest thì giữ latest (hoặc đặt latest nếu chưa có)
109+
# - nếu là version cụ thể/SHA thì cập nhật đúng giá trị
105110
if grep -q '^IMAGE_TAG=' .env; then
106-
sed -i "s/^IMAGE_TAG=.*/IMAGE_TAG=${IMAGE_TAG}/" .env
111+
if [ "${IMAGE_TAG}" = "latest" ]; then
112+
sed -i "s/^IMAGE_TAG=.*/IMAGE_TAG=latest/" .env
113+
else
114+
sed -i "s/^IMAGE_TAG=.*/IMAGE_TAG=${IMAGE_TAG}/" .env
115+
fi
107116
else
108117
echo "IMAGE_TAG=${IMAGE_TAG}" >> .env
109118
fi

docker-compose.prod-services.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ services:
221221
frontend:
222222
image: ${DOCKERHUB_USER}/codecampus-frontend:${IMAGE_TAG:-latest}
223223
restart: unless-stopped
224-
ports: [ "4200:4200" ]
224+
ports: [ "4200:80" ]
225225
networks: [ backend ]
226226

227227

0 commit comments

Comments
 (0)