mchapman/the-sourdough-framework
1
0
Fork 0
mirror of https://github.com/hendricius/the-sourdough-framework synced 2025-11-09 04:31:11 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

#308 — Build docker image for both amd64 and arm64 (#311)

Browse Source 
* Build for both amd64 and arm64

* Moving line to retrigger Actions check

* Removal of the `platform` flag—let system choose

* Indicate to apt-get that there is no frontend
This commit is contained in:
Anthony Atkinson
2023-12-18 03:43:12 -05:00
committed by GitHub
parent f2c68a9511
commit e6709b0f5e
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.github/workflows/docker-build-push.yml vendored
View File

@@ -49,6 +49,7 @@ jobs:
uses: docker/build-push-action@v5 uses: docker/build-push-action@v5
with: with:
context: . context: .
platforms: linux/amd64,linux/arm64
push: true push: true
tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.determine_tag.outputs.tag }} tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.determine_tag.outputs.tag }}
labels: ${{ steps.meta.outputs.labels }} labels: ${{ steps.meta.outputs.labels }}

4
Dockerfile
View File

@@ -10,7 +10,7 @@ RUN cat /etc/*release*
# Install base depdendencies # Install base depdendencies
RUN apt-get update && \ RUN apt-get update && \
apt-get install --yes -y --no-install-recommends \ DEBIAN_FRONTEND=noninteractive apt-get install --yes -y --no-install-recommends \
sudo \ sudo \
make \ make \
tidy \ tidy \
@@ -42,7 +42,7 @@ RUN apt-get update && \
# Install TeX # Install TeX
RUN apt-get update && \ RUN apt-get update && \
apt-get install -y --no-install-recommends \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
texlive-full \ texlive-full \
texlive-luatex texlive-luatex

2
makefile
View File

@@ -1,7 +1,7 @@
.DEFAULT_GOAL := build_pdf .DEFAULT_GOAL := build_pdf
DOCKER_IMAGE := ghcr.io/hendricius/the-sourdough-framework DOCKER_IMAGE := ghcr.io/hendricius/the-sourdough-framework
DOCKER_CMD := docker run -it -v $(PWD):/opt/repo --platform linux/x86_64 $(DOCKER_IMAGE) /bin/bash -c DOCKER_CMD := docker run -it -v $(PWD):/opt/repo $(DOCKER_IMAGE) /bin/bash -c
.PHONY: bake build_pdf build_docker_image push_docker_image validate website .PHONY: bake build_pdf build_docker_image push_docker_image validate website
.PHONY: print_os_version start_shell printvars show_tools_version mrproper .PHONY: print_os_version start_shell printvars show_tools_version mrproper