restructure dockerfile

This commit is contained in:
David Nedved
2020-04-01 09:39:29 +10:00
parent a83f79fc7e
commit 1d87c1cc6d
+4 -8
View File
@@ -44,13 +44,11 @@ jobs:
- -
name: Run Buildx (Build only - Won't push if build fails...) name: Run Buildx (Build only - Won't push if build fails...)
run: | run: |
docker buildx build \ docker buildx build --platform ${{ steps.prepare.outputs.docker_platforms }} \
--platform ${{ steps.prepare.outputs.docker_platforms }} \ --output "type=image,push=false" \
--build-arg "BUILD_DATE=${{ steps.prepare.outputs.build_date }}" \ --build-arg "BUILD_DATE=${{ steps.prepare.outputs.build_date }}" \
--build-arg "VCS_REF=${GITHUB_SHA::8}" \ --build-arg "VCS_REF=${GITHUB_SHA::8}" \
--build-arg "VERSION=${{ steps.prepare.outputs.version }}" \ --build-arg "VERSION=${{ steps.prepare.outputs.version }}" \
--output "type=image,push=false" \
--file Dockerfile . --file Dockerfile .
- -
name: Docker Login name: Docker Login
@@ -63,13 +61,11 @@ jobs:
- -
name: Run Buildx (Push to Docker Hub) name: Run Buildx (Push to Docker Hub)
run: | run: |
docker buildx build \ docker buildx build --platform ${{ steps.prepare.outputs.docker_platforms }} \
--platform ${{ steps.prepare.outputs.docker_platforms }} \ --output "type=image,push=true" \
--build-arg "BUILD_DATE=${{ steps.prepare.outputs.build_date }}" \ --build-arg "BUILD_DATE=${{ steps.prepare.outputs.build_date }}" \
--build-arg "VCS_REF=${GITHUB_SHA::8}" \ --build-arg "VCS_REF=${GITHUB_SHA::8}" \
--build-arg "VERSION=${{ steps.prepare.outputs.version }}" \ --build-arg "VERSION=${{ steps.prepare.outputs.version }}" \
--output "type=image,push=true" \
--file Dockerfile . --file Dockerfile .
- -
name: Clear name: Clear