From c4fc730220b478d5fd2a32033c84377a20641493 Mon Sep 17 00:00:00 2001 From: Matthew McKinnon Date: Sun, 22 Sep 2024 11:53:42 +1000 Subject: [PATCH] fix: set docker image to alpine --- .gitea/workflows/build.yml | 4 ++-- Dockerfile | 19 ++++++++++++++----- src/_includes/layouts/header.njk | 1 + 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index 9d05e2a..a26182a 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -1,7 +1,7 @@ on: push jobs: build-node: - runs-on: ubuntu-latest + runs-on: alpine-latest container: image: catthehacker/ubuntu:act-latest steps: @@ -36,7 +36,7 @@ jobs: tags: git.comprofix.com/mmckinnon/comprofix.com:latest publish: - runs-on: ubuntu-latest + runs-on: alpine-latest steps: - name: checkout repo uses: actions/checkout@v4 diff --git a/Dockerfile b/Dockerfile index 49fd254..ad2c585 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,13 +1,22 @@ -FROM php:8.1-apache +FROM httpd:2.4-alpine LABEL "Matthew McKinnon"="" -ENV "DEBIAN_FRONTEND"="noninteractive" +RUN apk update && apk add --no-cache \ + tzdata \ + git \ + php \ + php-fpm \ + php-zip \ + composer \ + musl-locales musl-locales-lang -RUN apt-get update -RUN apt-get clean && rm -rf /var/lib/apt/lists/* +# Set the locale to en_US.UTF-8 +ENV LANG=en_US.UTF-8 +ENV LC_ALL=en_US.UTF-8 +ENV LC_CTYPE=en_US.UTF-8 COPY --from=composer:2 /usr/bin/composer /usr/local/bin/composer -COPY _site/ /var/www/html +COPY _site/ /usr/local/apache2/htdocs/ WORKDIR / diff --git a/src/_includes/layouts/header.njk b/src/_includes/layouts/header.njk index 41918cc..b5a7923 100644 --- a/src/_includes/layouts/header.njk +++ b/src/_includes/layouts/header.njk @@ -1,4 +1,5 @@ + {{ title }}