This is an automated email from the ASF dual-hosted git repository.
danwatford pushed a commit to branch docker-experimental
in repository https://gitbox.apache.org/repos/asf/ofbiz-tools.git
The following commit(s) were added to refs/heads/docker-experimental by this
push:
new ef619da Implemented: Pull container images from ghcr.io (OFBIZ-12757)
ef619da is described below
commit ef619da59f7602a9feeb26778ae8f271b236a70c
Author: Daniel Watford <dan...@watfordconsulting.com>
AuthorDate: Wed Mar 1 18:12:00 2023 +0000
Implemented: Pull container images from ghcr.io (OFBIZ-12757)
Experimental container images for OFBiz are now built using GitHub
Actions and pushed to GitHub Packages (ghcr.io).
Rather than build container images on the demo VM, pull the pre-built
images from ghcr.io instead.
---
demo-backup/ofbizdocker/etc/cron.d/ofbizdocker | 2 +-
.../home/ofbizdocker/exp1/docker-compose.yml | 2 +-
.../home/ofbizdocker/exp2/docker-compose.yml | 2 +-
.../home/ofbizdocker/pull-and-restart.sh | 23 +++++++++++++
.../home/ofbizdocker/pull-rebuild-restart.sh | 39 ----------------------
5 files changed, 26 insertions(+), 42 deletions(-)
diff --git a/demo-backup/ofbizdocker/etc/cron.d/ofbizdocker
b/demo-backup/ofbizdocker/etc/cron.d/ofbizdocker
index e06d858..0ce8c48 100644
--- a/demo-backup/ofbizdocker/etc/cron.d/ofbizdocker
+++ b/demo-backup/ofbizdocker/etc/cron.d/ofbizdocker
@@ -1 +1 @@
-35 2 * * * ofbizdocker /home/ofbizdocker/pull-rebuild-restart.sh >
/home/ofbizdocker/pull-rebuild-restart.log 2>&1
+35 2 * * * ofbizdocker /home/ofbizdocker/pull-and-restart.sh >
/home/ofbizdocker/pull-and-restart.log 2>&1
diff --git a/demo-backup/ofbizdocker/home/ofbizdocker/exp1/docker-compose.yml
b/demo-backup/ofbizdocker/home/ofbizdocker/exp1/docker-compose.yml
index ed510e6..0921c62 100644
--- a/demo-backup/ofbizdocker/home/ofbizdocker/exp1/docker-compose.yml
+++ b/demo-backup/ofbizdocker/home/ofbizdocker/exp1/docker-compose.yml
@@ -2,7 +2,7 @@ version: "2.4"
services:
ofbiz:
- image: ofbiz-docker-preloaded-demo:latest
+ image: ghcr.io/apache/ofbiz:experimental-docker-branch-preloaddemo-snapshot
mem_limit: 1600M
memswap_limit: 1600M
cpu_shares: 200
diff --git a/demo-backup/ofbizdocker/home/ofbizdocker/exp2/docker-compose.yml
b/demo-backup/ofbizdocker/home/ofbizdocker/exp2/docker-compose.yml
index 81ec638..b62f093 100644
--- a/demo-backup/ofbizdocker/home/ofbizdocker/exp2/docker-compose.yml
+++ b/demo-backup/ofbizdocker/home/ofbizdocker/exp2/docker-compose.yml
@@ -2,7 +2,7 @@ version: "2.4"
services:
ofbiz:
- image: ofbiz-docker:latest
+ image: ghcr.io/apache/ofbiz:experimental-docker-branch-snapshot
mem_limit: 1600M
memswap_limit: 1600M
cpu_shares: 200
diff --git a/demo-backup/ofbizdocker/home/ofbizdocker/pull-and-restart.sh
b/demo-backup/ofbizdocker/home/ofbizdocker/pull-and-restart.sh
new file mode 100644
index 0000000..525c029
--- /dev/null
+++ b/demo-backup/ofbizdocker/home/ofbizdocker/pull-and-restart.sh
@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+# Script to pull and redeploy OFBiz container images to docker-compose
applications.
+
+set -x
+set -e
+
+cd /home/ofbizdocker
+
+echo Restarting exp1 docker-compose application with latest container images.
+pushd exp1
+docker compose down --volumes
+docker compose pull
+docker compose up --detach
+popd
+echo Exp1 docker-compose application restarted.
+
+echo Restarting exp2 docker-compose application with latest container images.
+pushd exp2
+docker compose down --volumes
+docker compose pull
+docker compose up --detach
+popd
+echo Exp2 docker-compose application restarted.
diff --git a/demo-backup/ofbizdocker/home/ofbizdocker/pull-rebuild-restart.sh
b/demo-backup/ofbizdocker/home/ofbizdocker/pull-rebuild-restart.sh
deleted file mode 100644
index 71e1c80..0000000
--- a/demo-backup/ofbizdocker/home/ofbizdocker/pull-rebuild-restart.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/usr/bin/env bash
-# Script to pull OFBiz sources, rebuild container images and redeploy those
container images to docker-compose applications.
-
-set -x
-set -e
-
-cd /home/ofbizdocker
-
-echo Pulling OFBiz sources.
-pushd ofbiz-framework
-git pull
-popd
-echo OFBiz sources updated.
-
-echo Building OFBiz docker image, preloaded with demo data.
-pushd ofbiz-framework
-DOCKER_BUILDKIT=1 docker build --progress plain --target demo --tag
ofbiz-docker-preloaded-demo .
-popd
-echo Built image ofbiz-docker-preloaded-demo.
-
-echo Building OFBiz docker image without preloaded data.
-pushd ofbiz-framework
-DOCKER_BUILDKIT=1 docker build --progress plain --tag ofbiz-docker .
-popd
-echo Built image ofbiz-docker.
-
-echo Restarting exp1 docker-compose application with latest container images.
-pushd exp1
-docker compose down --volumes
-docker compose up --detach
-popd
-echo Exp1 docker-compose application restarted.
-
-echo Restarting exp2 docker-compose application with latest container images.
-pushd exp2
-docker compose down --volumes
-docker compose up --detach
-popd
-echo Exp2 docker-compose application restarted.
