From 806b0ace54b1fa72abc34d52ecd23bdfd484cee0 Mon Sep 17 00:00:00 2001 From: "Simon L." Date: Fri, 21 Jun 2024 13:27:36 +0200 Subject: [PATCH] dockerfile: use new syntax Signed-off-by: Simon L. --- .github/workflows/imaginary-update.yml | 2 +- .github/workflows/nextcloud-update.yml | 2 +- .github/workflows/talk.yml | 2 +- Containers/collabora/Dockerfile | 2 +- Containers/docker-socket-proxy/Dockerfile | 2 +- Containers/fulltextsearch/Dockerfile | 2 +- Containers/imaginary/Dockerfile | 4 ++-- Containers/nextcloud/Dockerfile | 14 +++++++------- Containers/talk-recording/Dockerfile | 10 +++++----- 9 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/workflows/imaginary-update.yml b/.github/workflows/imaginary-update.yml index 27fb53e2..b8d26dbe 100644 --- a/.github/workflows/imaginary-update.yml +++ b/.github/workflows/imaginary-update.yml @@ -19,7 +19,7 @@ jobs: | cut -f1 \ | tail -1 )" - sed -i "s|^ENV IMAGINARY_HASH.*$|ENV IMAGINARY_HASH $imaginary_version|" ./Containers/imaginary/Dockerfile + sed -i "s|^ENV IMAGINARY_HASH.*$|ENV IMAGINARY_HASH=$imaginary_version|" ./Containers/imaginary/Dockerfile - name: Create Pull Request uses: peter-evans/create-pull-request@v6 diff --git a/.github/workflows/nextcloud-update.yml b/.github/workflows/nextcloud-update.yml index e1840fa6..6535d016 100644 --- a/.github/workflows/nextcloud-update.yml +++ b/.github/workflows/nextcloud-update.yml @@ -75,7 +75,7 @@ jobs: NC_MAJOR="$(grep "ENV NEXTCLOUD_VERSION" ./Containers/nextcloud/Dockerfile | grep -oP '[23][0-9]')" NCVERSION=$(curl -s -m 900 https://download.nextcloud.com/server/releases/ | sed --silent 's/.*href="nextcloud-\([^"]\+\).zip.asc".*/\1/p' | grep "$NC_MAJOR" | sort --version-sort | tail -1) if [ -n "$NCVERSION" ]; then - sed -i "s|^ENV NEXTCLOUD_VERSION.*|ENV NEXTCLOUD_VERSION $NCVERSION|" ./Containers/nextcloud/Dockerfile + sed -i "s|^ENV NEXTCLOUD_VERSION.*|ENV NEXTCLOUD_VERSION=$NCVERSION|" ./Containers/nextcloud/Dockerfile fi - name: Create Pull Request diff --git a/.github/workflows/talk.yml b/.github/workflows/talk.yml index de29ac39..15ea5fad 100644 --- a/.github/workflows/talk.yml +++ b/.github/workflows/talk.yml @@ -21,7 +21,7 @@ jobs: | grep -E "^v[0-9\.]+$" \ | tail -1 )" - sed -i "s|^ENV RECORDING_VERSION.*$|ENV RECORDING_VERSION $recording_version|" ./Containers/talk-recording/Dockerfile + sed -i "s|^ENV RECORDING_VERSION.*$|ENV RECORDING_VERSION=$recording_version|" ./Containers/talk-recording/Dockerfile curl -L "https://raw.githubusercontent.com/nextcloud/nextcloud-talk-recording/$recording_version/server.conf.in" -o Containers/talk-recording/recording.conf # Signaling diff --git a/Containers/collabora/Dockerfile b/Containers/collabora/Dockerfile index 788535cf..39f0db05 100644 --- a/Containers/collabora/Dockerfile +++ b/Containers/collabora/Dockerfile @@ -3,7 +3,7 @@ FROM collabora/code:24.04.4.1.1 USER root -ARG DEBIAN_FRONTEND noninteractive +ARG DEBIAN_FRONTEND=noninteractive # hadolint ignore=DL3008 RUN set -ex; \ diff --git a/Containers/docker-socket-proxy/Dockerfile b/Containers/docker-socket-proxy/Dockerfile index 5b844768..f244b0f4 100644 --- a/Containers/docker-socket-proxy/Dockerfile +++ b/Containers/docker-socket-proxy/Dockerfile @@ -3,7 +3,7 @@ FROM haproxy:3.0.2-alpine # hadolint ignore=DL3002 USER root -ENV NEXTCLOUD_HOST nextcloud-aio-nextcloud +ENV NEXTCLOUD_HOST=nextcloud-aio-nextcloud RUN set -ex; \ apk upgrade --no-cache -a; \ apk add --no-cache \ diff --git a/Containers/fulltextsearch/Dockerfile b/Containers/fulltextsearch/Dockerfile index 5c7adb15..df54a301 100644 --- a/Containers/fulltextsearch/Dockerfile +++ b/Containers/fulltextsearch/Dockerfile @@ -4,7 +4,7 @@ FROM elasticsearch:8.14.1 USER root -ARG DEBIAN_FRONTEND noninteractive +ARG DEBIAN_FRONTEND=noninteractive # hadolint ignore=DL3008 RUN set -ex; \ diff --git a/Containers/imaginary/Dockerfile b/Containers/imaginary/Dockerfile index 7c810683..8a1fc3de 100644 --- a/Containers/imaginary/Dockerfile +++ b/Containers/imaginary/Dockerfile @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:latest FROM golang:1.22.3-alpine3.20 AS go -ENV IMAGINARY_HASH 6cd9edd1d3fb151eb773c14552886e4fc8e50138 +ENV IMAGINARY_HASH=6cd9edd1d3fb151eb773c14552886e4fc8e50138 RUN set -ex; \ apk add --no-cache \ @@ -30,7 +30,7 @@ RUN set -ex; \ COPY --from=go /go/bin/imaginary /usr/local/bin/imaginary COPY --chmod=775 start.sh /start.sh -ENV PORT 9000 +ENV PORT=9000 USER nobody diff --git a/Containers/nextcloud/Dockerfile b/Containers/nextcloud/Dockerfile index 239c6578..75aa18ae 100644 --- a/Containers/nextcloud/Dockerfile +++ b/Containers/nextcloud/Dockerfile @@ -1,15 +1,15 @@ # syntax=docker/dockerfile:latest FROM php:8.2.20-fpm-alpine3.20 -ENV PHP_MEMORY_LIMIT 512M -ENV PHP_UPLOAD_LIMIT 10G -ENV PHP_MAX_TIME 3600 -ENV SOURCE_LOCATION /usr/src/nextcloud +ENV PHP_MEMORY_LIMIT=512M +ENV PHP_UPLOAD_LIMIT=10G +ENV PHP_MAX_TIME=3600 +ENV SOURCE_LOCATION=/usr/src/nextcloud # AIO settings start # Do not remove or change this line! -ENV NEXTCLOUD_VERSION 29.0.2 -ENV AIO_TOKEN 123456 -ENV AIO_URL localhost +ENV NEXTCLOUD_VERSION=29.0.2 +ENV AIO_TOKEN=123456 +ENV AIO_URL=localhost # AIO settings end # Do not remove or change this line! COPY --chmod=775 *.sh / diff --git a/Containers/talk-recording/Dockerfile b/Containers/talk-recording/Dockerfile index 5f268ceb..e61a1680 100644 --- a/Containers/talk-recording/Dockerfile +++ b/Containers/talk-recording/Dockerfile @@ -3,11 +3,11 @@ FROM python:3.12.4-alpine3.20 COPY --chmod=775 start.sh /start.sh -ENV RECORDING_VERSION v0.1 -ENV ALLOW_ALL false -ENV HPB_PROTOCOL https -ENV SKIP_VERIFY false -ENV HPB_PATH /standalone-signaling/ +ENV RECORDING_VERSION=v0.1 +ENV ALLOW_ALL=false +ENV HPB_PROTOCOL=https +ENV SKIP_VERIFY=false +ENV HPB_PATH=/standalone-signaling/ RUN set -ex; \ apk upgrade --no-cache -a; \