diff --git a/.gitea/workflows/dev.yaml b/.gitea/workflows/dev.yaml index 02979d5..5e9048a 100644 --- a/.gitea/workflows/dev.yaml +++ b/.gitea/workflows/dev.yaml @@ -6,7 +6,7 @@ on: - main jobs: - Ddockerfile lint: + Dockerfile lint: runs-on: k3s steps: - uses: actions/checkout@v3 @@ -15,19 +15,17 @@ jobs: dockerfile: Dockerfile build: + needs: Dockerfile lint runs-on: docker - needs: "Dockerfile lint" steps: - uses: actions/checkout@v3 - - name: docker login - run: docker login gitea.sikorski.cloud -u rogersik -p $ROGERSIK_REGISTRY_TOKEN - name: Pull Docker Image for caching - run: docker pull gitea.sikorski.cloud/rogersik/docker-monica:development || exit 0 - - name: Build the Docker image + run: docker pull gitea.sikorski.cloud/rogersik/monica:development || exit 0 + - name: Build docker image run: | docker build . \ - --cache-from gitea.sikorski.cloud/rogersik/docker-monica:development \ + --cache-from gitea.sikorski.cloud/rogersik/monica:development \ --file Dockerfile \ - --tag gitea.sikorski.cloud/rogersik/docker-monica:development - - name: Push the Docker image - run: docker push gitea.sikorski.cloud/rogersik/docker-monica --all-tags + --tag gitea.sikorski.cloud/rogersik/monica:development + - name: Push docker image + run: docker push gitea.sikorski.cloud/rogersik/monica:development diff --git a/.gitea/workflows/main.yaml b/.gitea/workflows/main.yaml index 24adb0f..602bce4 100644 --- a/.gitea/workflows/main.yaml +++ b/.gitea/workflows/main.yaml @@ -8,7 +8,7 @@ on: - cron: "0 6 * * SUN" jobs: - Ddockerfile lint: + Dockerfile lint: runs-on: k3s steps: - uses: actions/checkout@v3 @@ -17,18 +17,17 @@ jobs: dockerfile: Dockerfile build: + needs: Dockerfile lint runs-on: docker - needs: "Dockerfile lint" steps: - uses: actions/checkout@v3 - name: Pull Docker Image for caching - run: docker pull gitea.sikorski.cloud/rogersik/docker-monica:latest - - name: Build the Docker image + run: docker pull gitea.sikorski.cloud/rogersik/monica:development || exit 0 + - name: Build docker image run: | docker build . \ - --cache-from gitea.sikorski.cloud/rogersik/docker-monica:latest \ + --cache-from gitea.sikorski.cloud/rogersik/monica:development \ --file Dockerfile \ - --tag gitea.sikorski.cloud/rogersik/docker-monica:latest \ - --tag gitea.sikorski.cloud/rogersik/docker-monica:4 - - name: Push the Docker image - run: docker push gitea.sikorski.cloud/rogersik/docker-monica --all-tags + --tag gitea.sikorski.cloud/rogersik/monica:development + - name: Push docker image + run: docker push gitea.sikorski.cloud/rogersik/monica:development