Merge branch 'master' into update-docker-fedora-version

This commit is contained in:
abraunegg 2023-04-18 10:59:34 +10:00
commit a1b4c1510a
2 changed files with 5 additions and 1 deletions

View file

@ -1,7 +1,7 @@
# -*-Dockerfile-*-
ARG ALPINE_VERSION=3.17
ARG GO_VERSION=1.19
ARG GO_VERSION=1.20
ARG GOSU_VERSION=1.14
FROM golang:${GO_VERSION}-alpine${ALPINE_VERSION} AS builder-gosu
@ -23,6 +23,9 @@ RUN autoreconf -fiv \
FROM alpine:${ALPINE_VERSION}
RUN apk add --upgrade apk-tools \
&& apk upgrade --available
RUN apk add --update --no-cache bash libcurl libgcc shadow sqlite-libs ldc-runtime \
&& mkdir -p /onedrive/conf /onedrive/data

View file

@ -19,6 +19,7 @@ RUN ./configure DC=/usr/bin/ldmd2 \
FROM debian:${DEBIAN_VERSION}-slim
RUN apt-get update \
&& apt-get upgrade -y \
&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends gosu libcurl4 libsqlite3-0 ca-certificates libphobos2-ldc-shared94 \
&& rm -rf /var/lib/apt/lists/* \
# Fix bug with ssl on armhf: https://serverfault.com/a/1045189