Workflows (#393)

* update build scripts and workflows
kartoza · Oct 27, 2022 · 3a49b15 · 3a49b15
1 parent 6fc6147
commit 3a49b15
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 12 deletions.
diff --git a/.github/workflows/build-latest.yaml b/.github/workflows/build-latest.yaml
@@ -45,9 +45,9 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v2
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
       - name: Build image for testing
         id: docker_build_testing_image
         uses: docker/build-push-action@v3
@@ -100,11 +100,11 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v2
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
       - name: Login to DockerHub
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_PASSWORD }}

diff --git a/.github/workflows/deploy-image.yaml b/.github/workflows/deploy-image.yaml
@@ -41,12 +41,12 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v2
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
 
       - name: Login to DockerHub
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_PASSWORD }}

diff --git a/build-base.sh b/build-base.sh
@@ -6,5 +6,9 @@ if [[ ! -f .env ]]; then
     cp .example.env .env
 fi
 
-docker-compose -f docker-compose.build.yml build postgis-base
+if [[ $(dpkg -l | grep "docker-compose") > /dev/null ]];then
+  docker-compose -f docker-compose.build.yml build postgis-base
+else
+  docker compose -f docker-compose.build.yml build postgis-base
+fi
 
diff --git a/build-test.sh b/build-test.sh
@@ -6,4 +6,8 @@ if [[ ! -f .env ]]; then
     cp .example.env .env
 fi
 
-docker-compose -f docker-compose.build.yml build postgis-test
+if [[ $(dpkg -l | grep "docker-compose") > /dev/null ]];then
+  docker-compose -f docker-compose.build.yml build postgis-test
+else
+  docker compose -f docker-compose.build.yml build postgis-test
+fi
diff --git a/build.sh b/build.sh
@@ -5,6 +5,14 @@ if [[ ! -f .env ]]; then
     cp .example.env .env
 fi
 
-docker-compose -f docker-compose.build.yml build postgis-prod
+if [[ $(dpkg -l | grep "docker-compose") > /dev/null ]];then
+  docker-compose -f docker-compose.build.yml build postgis-prod
+else
+  docker compose -f docker-compose.build.yml build postgis-prod
+fi
 
-#docker-compose -f docker-compose.build-timescale.yml build postgis-prod
+#if [[ $(dpkg -l | grep "docker-compose") > /dev/null ]];then
+  #docker-compose -f docker-compose.build-timescale.yml build postgis-prod
+#else
+  #docker compose -f docker-compose.build-timescale.yml build postgis-prod
+#fi