aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorEgor Tensin <Egor.Tensin@gmail.com>2022-10-15 23:55:13 +0200
committerEgor Tensin <Egor.Tensin@gmail.com>2022-10-16 00:23:06 +0200
commitb22b51009c8cbfcb39fc301ac0f675edf2ef5c92 (patch)
treedb96b4c01a957fe19c3215500896d87ed2228d70
parentfrontend: fix Docker builds (diff)
downloadcgitize-b22b51009c8cbfcb39fc301ac0f675edf2ef5c92.tar.gz
cgitize-b22b51009c8cbfcb39fc301ac0f675edf2ef5c92.zip
move Dockerfile to docker/
-rw-r--r--.github/workflows/ci.yml5
-rw-r--r--docker-compose.yml1
-rw-r--r--docker/Dockerfile (renamed from Dockerfile)0
3 files changed, 4 insertions, 2 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 32d6d88..468c88c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -76,7 +76,7 @@ jobs:
matrix:
service: [backend, frontend]
include:
- - {service: backend, context: ., image: cgitize}
+ - {service: backend, file: docker/Dockerfile, image: cgitize}
- {service: frontend, context: docker/frontend, image: cgitize-frontend}
name: 'Publish / Docker Hub / ${{ matrix.service }}'
if: github.event_name == 'push' && (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/'))
@@ -118,10 +118,11 @@ jobs:
uses: docker/build-push-action@v2
with:
context: '${{ matrix.context }}'
+ file: '${{ matrix.file }}'
+ labels: '${{ steps.meta.outputs.labels }}'
platforms: '${{ steps.platforms.outputs.platforms }}'
push: true
tags: '${{ steps.meta.outputs.tags }}'
- labels: '${{ steps.meta.outputs.labels }}'
publish_pypi:
needs: [test_local, test_example_config, test_docker, publish_docker]
diff --git a/docker-compose.yml b/docker-compose.yml
index 21c061c..4aa183b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,6 +4,7 @@ services:
cgitize:
build:
context: .
+ dockerfile: docker/Dockerfile
environment:
# Every 3 hours:
SCHEDULE: '0 */3 * * *'
diff --git a/Dockerfile b/docker/Dockerfile
index 9b9a8f6..9b9a8f6 100644
--- a/Dockerfile
+++ b/docker/Dockerfile