mirror of
https://github.com/gilbN/theme.park.git
synced 2024-10-27 06:12:54 +01:00
take 2
This commit is contained in:
parent
642b9db799
commit
12be2dd795
19
.github/workflows/docker-build.yml
vendored
19
.github/workflows/docker-build.yml
vendored
@ -37,8 +37,7 @@ jobs:
|
||||
run: |
|
||||
ARCHITECTURE=${{ matrix.architecture }}
|
||||
echo ::set-output name=VERSION::${{ github.event.release.tag_name }}
|
||||
echo ::set-output name=platform::${ARCHITECTURE//-/\/}
|
||||
|
||||
echo ::set-output name=platform::${ARCHITECTURE}
|
||||
- name: Set current date as env variable
|
||||
id: date_time
|
||||
run: echo ::set-output name=NOW::$(date +'%Y-%m-%dT%H:%M:%S')
|
||||
@ -77,8 +76,8 @@ jobs:
|
||||
if: ${{ github.event.release.target_commitish == 'master' }}
|
||||
uses: docker/build-push-action@v2
|
||||
with:
|
||||
context: .
|
||||
platforms: linux/amd64,linux/arm/v7,linux/arm64
|
||||
file: ./Dockerfile.${{ matrix.architecture }}
|
||||
platforms: ${{ matrix.architecture }
|
||||
push: ${{ github.event_name != 'pull_request' }}
|
||||
tags: latest, ${{ steps.prep.outputs.VERSION }}
|
||||
labels: ${{ steps.metadata.outputs.labels }}
|
||||
@ -88,8 +87,8 @@ jobs:
|
||||
if: ${{ github.event.inputs.branch == 'master' }}
|
||||
uses: docker/build-push-action@v2
|
||||
with:
|
||||
context: .
|
||||
platforms: linux/amd64,linux/arm/v7,linux/arm64
|
||||
file: ./Dockerfile.${{ matrix.architecture }}
|
||||
platforms: ${{ matrix.architecture }
|
||||
push: ${{ github.event_name != 'pull_request' }}
|
||||
tags: latest, ${{ github.event.inputs.tag }}
|
||||
labels: ${{ steps.metadata.outputs.labels }}
|
||||
@ -99,8 +98,8 @@ jobs:
|
||||
if: ${{ github.ref == 'refs/heads/develop' || github.event.inputs.branch == 'develop' }}
|
||||
uses: docker/build-push-action@v2
|
||||
with:
|
||||
context: .
|
||||
platforms: linux/amd64,linux/arm/v7,linux/arm64
|
||||
file: ./Dockerfile.${{ matrix.architecture }}
|
||||
platforms: ${{ matrix.architecture }
|
||||
push: ${{ github.event_name != 'pull_request' }}
|
||||
tags: ${{ steps.metadata.outputs.tags }}
|
||||
labels: ${{ steps.metadata.outputs.labels }}
|
||||
@ -111,8 +110,8 @@ jobs:
|
||||
uses: docker/build-push-action@v2
|
||||
with:
|
||||
file: ./Dockerfile.${{ matrix.architecture }}
|
||||
platforms: ${{ steps.prep.outputs.platform }}
|
||||
platforms: ${{ matrix.architecture }
|
||||
push: ${{ github.event_name != 'pull_request' }}
|
||||
tags: ${{ steps.metadata.outputs.tags }}
|
||||
labels: ${{ steps.metadata.outputs.labels }}
|
||||
build-args: TP_RELEASE=${{ steps.prep.outputs.VERSION }},BUILD_DATE=${{ steps.date_time.outputs.NOW }}
|
||||
build-args: TP_RELEASE=${{ steps.prep.outputs.VERSION }},BUILD_DATE=${{ steps.date_time.outputs.NOW }}, PLATFORM=${{ steps.prep.outputs.platform }}
|
||||
|
@ -1,9 +1,9 @@
|
||||
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.14
|
||||
FROM --platform=${BUILDPLATFORM} ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.14
|
||||
|
||||
# set version label
|
||||
ARG BUILD_DATE
|
||||
ARG TP_RELEASE
|
||||
LABEL build_version="Version:- ${VERSION} Build-date:- ${BUILD_DATE} Platform: ${BUILDPLATFORM}"
|
||||
LABEL build_version="Version:- ${VERSION} Build-date:- ${BUILD_DATE} Platform: ${ARCHITECTURE}"
|
||||
LABEL maintainer="gilbn"
|
||||
LABEL org.opencontainers.image.description DESCRIPTION
|
||||
|
||||
|
@ -1,9 +1,9 @@
|
||||
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.14
|
||||
FROM --platform=${BUILDPLATFORM} ghcr.io/linuxserver/baseimage-alpine-nginx:3.14
|
||||
|
||||
# set version label
|
||||
ARG BUILD_DATE
|
||||
ARG TP_RELEASE
|
||||
LABEL build_version="Version:- ${VERSION} Build-date:- ${BUILD_DATE} Platform: ${BUILDPLATFORM}"
|
||||
LABEL build_version="Version:- ${VERSION} Build-date:- ${BUILD_DATE} Platform: ${ARCHITECTURE}"
|
||||
LABEL maintainer="gilbn"
|
||||
LABEL org.opencontainers.image.description DESCRIPTION
|
||||
|
||||
|
@ -1,9 +1,9 @@
|
||||
FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.14
|
||||
FROM --platform=${BUILDPLATFORM} ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.14
|
||||
|
||||
# set version label
|
||||
ARG BUILD_DATE
|
||||
ARG TP_RELEASE
|
||||
LABEL build_version="Version:- ${VERSION} Build-date:- ${BUILD_DATE} Platform: ${BUILDPLATFORM}"
|
||||
LABEL build_version="Version:- ${VERSION} Build-date:- ${BUILD_DATE} Platform: ${ARCHITECTURE}"
|
||||
LABEL maintainer="gilbn"
|
||||
LABEL org.opencontainers.image.description DESCRIPTION
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user