From fa5be19e64bcf788fd15fd6a8ed0d10a1176d65c Mon Sep 17 00:00:00 2001
From: Muhamad Aditya Prima <map@sindigilive.com>
Date: Fri, 13 Dec 2024 04:36:02 +0700
Subject: [PATCH] Fixed wrong action workflow

---
 .gitea/workflows/alpine-dockerio.yaml | 2 +-
 .gitea/workflows/alpine-winter.yaml   | 1 +
 Dockerfile.alpine                     | 6 ++++--
 Dockerfile.apache-alpine              | 3 ++-
 Dockerfile.ubi9                       | 2 +-
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/.gitea/workflows/alpine-dockerio.yaml b/.gitea/workflows/alpine-dockerio.yaml
index f904bbf..5dfd23d 100644
--- a/.gitea/workflows/alpine-dockerio.yaml
+++ b/.gitea/workflows/alpine-dockerio.yaml
@@ -232,7 +232,7 @@ jobs:
           push: true
           tags: |
             aprimediet/php:8.3-apache-alpine
-      - name: Build and push 8.3 with Apache2
+      - name: Build and push 8.4 with Apache2
         uses: docker/build-push-action@v5
         with:
           context: .
diff --git a/.gitea/workflows/alpine-winter.yaml b/.gitea/workflows/alpine-winter.yaml
index e9e45f6..544ca49 100644
--- a/.gitea/workflows/alpine-winter.yaml
+++ b/.gitea/workflows/alpine-winter.yaml
@@ -127,6 +127,7 @@ jobs:
             PHP_VERSION=84
           push: true
           tags: |
+            git.winteraccess.id/${{ gitea.repository }}:8-alpine
             git.winteraccess.id/${{ gitea.repository }}:8.4-alpine
   build-apache:
     name: Build and push apache image
diff --git a/Dockerfile.alpine b/Dockerfile.alpine
index 1791878..a58c283 100644
--- a/Dockerfile.alpine
+++ b/Dockerfile.alpine
@@ -8,12 +8,12 @@
 # PHP 8.3 == 3.19
 # PHP 8.4 == 3.21
 ARG REGISTRY_URL=docker.io/aprimediet
-ARG ALPINE_VERSION=3.19
+ARG ALPINE_VERSION=3.21
 
 FROM ${REGISTRY_URL}/alpine:${ALPINE_VERSION}
 LABEL maintainer="<Muhamad Aditya Prima> aprimediet@gmail.com"
 
-ARG PHP_VERSION=83
+ARG PHP_VERSION=84
 ENV PHP_VERSION=${PHP_VERSION}
 
 WORKDIR /root
@@ -27,3 +27,5 @@ RUN ln -ns /usr/bin/php${PHP_VERSION} /usr/bin/php; exit 0
 
 # CLEAN APK CACHES
 RUN rm -vrf /var/cache/apk/*
+
+CMD ["/usr/bin/php"]
diff --git a/Dockerfile.apache-alpine b/Dockerfile.apache-alpine
index eb1d1de..c407eb3 100644
--- a/Dockerfile.apache-alpine
+++ b/Dockerfile.apache-alpine
@@ -1,4 +1,4 @@
-ARG REGISTRY_URL=git.winteraccess.id/docker
+ARG REGISTRY_URL=docker.io/aprimediet
 ARG PHP=8.3
 
 FROM ${REGISTRY_URL}/php:${PHP}-alpine
@@ -51,6 +51,7 @@ ADD ./scripts/apache-entrypoint-alpine /usr/local/bin/entrypoint
 
 RUN chmod +x /usr/local/bin/entrypoint && \
     cp -vR /var/www/localhost/htdocs/* ${APP_DIR}/ && \
+    rm -vrf /var/www && \
     chown -R apache:apache ${APP_DIR}
 
 WORKDIR ${APP_DIR}
diff --git a/Dockerfile.ubi9 b/Dockerfile.ubi9
index cbf63be..c540c1b 100644
--- a/Dockerfile.ubi9
+++ b/Dockerfile.ubi9
@@ -4,7 +4,7 @@ ARG UBI_VERSION=9.5
 FROM ${REGISTRY_URL}/ubi9:${UBI_VERSION} AS builder
 LABEL maintainer="<Muhamad Aditya Prima> aprimediet@gmail.com"
 
-ARG PHP_VERSION=8.3
+ARG PHP_VERSION=8.4
 ENV PHP_VERSION=${PHP_VERSION}
 
 USER root