Build Dockerize directly (for ARM64 support); add ARM64 support back.
This commit is contained in:
parent
fe4cdaaae8
commit
263d87b395
|
@ -108,6 +108,9 @@ jobs:
|
||||||
- name: Build OpenAPI Docs
|
- name: Build OpenAPI Docs
|
||||||
run: bin/console azuracast:api:docs
|
run: bin/console azuracast:api:docs
|
||||||
|
|
||||||
|
- name: Set up QEMU
|
||||||
|
uses: docker/setup-qemu-action@v1
|
||||||
|
|
||||||
- name: Set up Docker Buildx
|
- name: Set up Docker Buildx
|
||||||
uses: docker/setup-buildx-action@v1
|
uses: docker/setup-buildx-action@v1
|
||||||
|
|
||||||
|
@ -116,6 +119,7 @@ jobs:
|
||||||
with:
|
with:
|
||||||
context: .
|
context: .
|
||||||
load: true
|
load: true
|
||||||
|
platforms : linux/amd64,linux/arm64
|
||||||
tags: ghcr.io/azuracast/web:latest
|
tags: ghcr.io/azuracast/web:latest
|
||||||
cache-from: type=registry,ref=ghcr.io/azuracast/web:buildcache
|
cache-from: type=registry,ref=ghcr.io/azuracast/web:buildcache
|
||||||
|
|
||||||
|
@ -177,6 +181,7 @@ jobs:
|
||||||
with:
|
with:
|
||||||
context: .
|
context: .
|
||||||
push: true
|
push: true
|
||||||
|
platforms : linux/amd64,linux/arm64
|
||||||
tags: ${{ steps.meta.outputs.tags }}
|
tags: ${{ steps.meta.outputs.tags }}
|
||||||
labels: ${{ steps.meta.outputs.labels }}
|
labels: ${{ steps.meta.outputs.labels }}
|
||||||
cache-to: type=registry,ref=ghcr.io/azuracast/web:buildcache,mode=max
|
cache-to: type=registry,ref=ghcr.io/azuracast/web:buildcache,mode=max
|
||||||
|
|
14
Dockerfile
14
Dockerfile
|
@ -1,8 +1,18 @@
|
||||||
# Base install step (done first for caching purposes).
|
FROM golang:1.17-buster AS dockerize
|
||||||
FROM ubuntu:focal as base
|
|
||||||
|
RUN apt-get update \
|
||||||
|
&& apt-get install -y --no-install-recommends openssl git
|
||||||
|
|
||||||
|
RUN go install github.com/jwilder/dockerize@latest
|
||||||
|
|
||||||
|
# Final build image
|
||||||
|
FROM ubuntu:focal
|
||||||
|
|
||||||
ENV TZ="UTC"
|
ENV TZ="UTC"
|
||||||
|
|
||||||
|
# Add Dockerize
|
||||||
|
COPY --from=dockerize /go/bin/dockerize /usr/local/bin
|
||||||
|
|
||||||
# Run base build process
|
# Run base build process
|
||||||
COPY ./util/docker/web /bd_build/
|
COPY ./util/docker/web /bd_build/
|
||||||
|
|
||||||
|
|
|
@ -1,9 +0,0 @@
|
||||||
#!/bin/bash
|
|
||||||
set -e
|
|
||||||
source /bd_build/buildconfig
|
|
||||||
set -x
|
|
||||||
|
|
||||||
DOCKERIZE_VERSION=v0.6.1
|
|
||||||
wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz
|
|
||||||
tar -C /usr/local/bin -xzvf dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz
|
|
||||||
rm dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz
|
|
Loading…
Reference in New Issue