Fix Ubuntu build and upgrade to latest Ubuntu LTS release

This commit is contained in:
Bojan Čekrlić 2023-02-09 09:22:59 +01:00
parent 3eac3f42ae
commit 1be2c20b89
3 changed files with 5 additions and 4 deletions

View file

@ -128,7 +128,7 @@ jobs:
cache-from: type=local,src=/tmp/.buildx-cache/ubuntu
cache-to: type=local,dest=/tmp/.buildx-cache-new/ubuntu
build-args: |
BASE_IMAGE=ubuntu:focal
BASE_IMAGE=ubuntu:jammy
- name: Move cache
run: |

View file

@ -1,7 +1,7 @@
# syntax=docker/dockerfile:1.2
ARG BASE_IMAGE=alpine:latest
# ARG BASE_IMAGE=ubuntu:focal
# ARG BASE_IMAGE=ubuntu:jammy
FROM ${BASE_IMAGE} AS build-scripts
COPY ./build-scripts ./build-scripts
@ -27,12 +27,13 @@ FROM base AS sasl
ARG TARGETPLATFORM
ARG SASL_XOAUTH2_REPO_URL=https://github.com/tarickb/sasl-xoauth2.git
ARG SASL_XOAUTH2_GIT_REF=release-0.14
ARG SASL_XOAUTH2_GIT_REF=release-0.18
# --mount=type=cache,target=/var/cache/apk,sharing=locked,id=var-cache-apk-$TARGETPLATFORM \
# --mount=type=cache,target=/etc/apk/cache,sharing=locked,id=etc-apk-cache-$TARGETPLATFORM \
RUN --mount=type=cache,target=/var/cache/apt,sharing=locked,id=var-cache-apt-$TARGETPLATFORM \
--mount=type=cache,target=/var/lib/apt,sharing=locked,id=var-lib-apt-$TARGETPLATFORM \
--mount=type=tmpfs,target=/etc/apk/cache \
--mount=type=tmpfs,target=/var/cache/apk \
--mount=type=tmpfs,target=/tmp \
--mount=type=tmpfs,target=/sasl-xoauth2 \

View file

@ -17,7 +17,7 @@ do_ubuntu() {
apt-get install -y libsasl2-modules
apt-get install -y postfix
apt-get install -y opendkim
apt-get install -y ca-certificates tzdata supervisor rsyslog bash opendkim-tools curl libcurl4 libjsoncpp1 sasl2-bin postfix-lmdb netcat
apt-get install -y ca-certificates tzdata supervisor rsyslog bash opendkim-tools curl libcurl4 libjsoncpp25 sasl2-bin postfix-lmdb netcat
}
if [ -f /etc/alpine-release ]; then