From af8544f88f277ab0ceafe2ad29f33d6172b7ca3e Mon Sep 17 00:00:00 2001
From: Avei20 <muhammadabdulazizalghofari@gmail.com>
Date: Wed, 7 May 2025 01:28:37 +0700
Subject: [PATCH] feat: adding github action to push image into registry

---
 .github/workflows/docker-build-and-push.yml | 38 +++++++++++++++++++++
 17.0/Dockerfile.custom                      |  4 ++-
 docker-compose.yaml                         |  2 +-
 3 files changed, 42 insertions(+), 2 deletions(-)
 create mode 100644 .github/workflows/docker-build-and-push.yml

diff --git a/.github/workflows/docker-build-and-push.yml b/.github/workflows/docker-build-and-push.yml
new file mode 100644
index 0000000..42665ca
--- /dev/null
+++ b/.github/workflows/docker-build-and-push.yml
@@ -0,0 +1,38 @@
+name: Build and Push Docker Images
+
+on:
+  push:
+    branches:
+      - master
+  workflow_dispatch:
+
+jobs:
+  build-and-push:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Log in to GitHub Container Registry
+        uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and push Docker image for 17.0
+        uses: docker/build-push-action@v4
+        with:
+          context: ./17.0
+          file: ./17.0/Dockerfile
+          push: true
+          tags: ghcr.io/${{ github.repository }}/17.0:latest
+
+      - name: Build and push Docker image for 18.0
+        uses: docker/build-push-action@v4
+        with:
+          context: ./18.0
+          file: ./18.0/Dockerfile
+          push: true
+          tags: ghcr.io/${{ github.repository }}/18.0:latest
diff --git a/17.0/Dockerfile.custom b/17.0/Dockerfile.custom
index b616300..3db48a8 100644
--- a/17.0/Dockerfile.custom
+++ b/17.0/Dockerfile.custom
@@ -89,7 +89,9 @@ RUN chown odoo /etc/odoo/odoo.conf \
     && mkdir -p /mnt/extra-addons \
     && chown -R odoo /mnt/extra-addons \
     && chmod +x /init-odoo.sh \
-    && chown -R odoo /init-odoo.sh
+    && chown -R odoo /init-odoo.sh \
+    && chmod +x /entrypoint.sh \
+    && chown -R odoo /entrypoint.sh
 
 VOLUME ["/var/lib/odoo", "/mnt/extra-addons"]
 
diff --git a/docker-compose.yaml b/docker-compose.yaml
index d34379c..edc3e84 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -9,7 +9,7 @@ services:
       - 1234:5432
   odoo:
     build:
-      context: ./17.0
+      context: ./18.0
       dockerfile: Dockerfile.custom
     environment:
       DB_NAME: odoo