mykitserver/docker-limesurvey
1
0
Fork 0
mirror of https://github.com/mykitserver/docker-limesurvey.git synced 2025-12-06 16:39:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix linting issues

Browse Source
This commit is contained in:
Markus Opolka
2023-06-09 13:18:56 +02:00
parent 52ee67675a
commit 66f433e1d0
9 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
3.0/apache/Dockerfile
View File

@@ -12,6 +12,7 @@ RUN set -ex; \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
# Install PHP Plugins and Configure PHP imap plugin # Install PHP Plugins and Configure PHP imap plugin
# hadolint ignore=SC2086
RUN set -ex; \ RUN set -ex; \
\ \
savedAptMark="$(apt-mark showmanual)"; \ savedAptMark="$(apt-mark showmanual)"; \
@@ -51,7 +52,7 @@ RUN set -ex; \
zip \ zip \
; \ ; \
\ \
# reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies # Reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
apt-mark auto '.*' > /dev/null; \ apt-mark auto '.*' > /dev/null; \
apt-mark manual $savedAptMark; \ apt-mark manual $savedAptMark; \
ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \ ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
@@ -85,7 +86,7 @@ ARG USER=root
ARG LISTEN_PORT=80 ARG LISTEN_PORT=80
ENV LIMESURVEY_VERSION=$version ENV LIMESURVEY_VERSION=$version
# Download, unzip and chmod LimeSurvey from GitHub (defaults to the official LimeSurvey/LimeSurvey repository) # Download, unzip and chmod LimeSurvey from GitHub (defaults to the official LimeSurvey/LimeSurvey repository)
RUN set -ex; \ RUN set -ex; \
curl -sSL "${archive_url}" --output /tmp/limesurvey.tar.gz && \ curl -sSL "${archive_url}" --output /tmp/limesurvey.tar.gz && \
echo "${sha256_checksum} /tmp/limesurvey.tar.gz" | sha256sum -c - && \ echo "${sha256_checksum} /tmp/limesurvey.tar.gz" | sha256sum -c - && \

3
3.0/fpm-alpine/Dockerfile
View File

@@ -5,6 +5,7 @@ LABEL maintainer="markus@martialblog.de"
RUN apk add --no-cache netcat-openbsd bash RUN apk add --no-cache netcat-openbsd bash
# Install PHP Plugins # Install PHP Plugins
# hadolint ignore=SC2086
RUN set -ex; \ RUN set -ex; \
apk add --no-cache --virtual .build-deps \ apk add --no-cache --virtual .build-deps \
freetype-dev \ freetype-dev \
@@ -42,7 +43,7 @@ RUN set -ex; \
| sort -u \ | sort -u \
| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
)"; \ )"; \
apk add --no-cache --no-network --virtual .limesurvey-phpext-rundeps "${runDeps}"; \ apk add --no-cache --no-network --virtual .limesurvey-phpext-rundeps $runDeps; \
apk del --no-cache --no-network .build-deps apk del --no-cache --no-network .build-deps
ARG version="3.28.56+230404" ARG version="3.28.56+230404"

5
3.0/fpm/Dockerfile
View File

@@ -12,6 +12,7 @@ RUN set -ex; \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
# Install PHP Plugins and Configure PHP imap plugin # Install PHP Plugins and Configure PHP imap plugin
# hadolint ignore=SC2086
RUN set -ex; \ RUN set -ex; \
\ \
savedAptMark="$(apt-mark showmanual)"; \ savedAptMark="$(apt-mark showmanual)"; \
@@ -51,7 +52,7 @@ RUN set -ex; \
zip \ zip \
; \ ; \
\ \
# reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies # Reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
apt-mark auto '.*' > /dev/null; \ apt-mark auto '.*' > /dev/null; \
apt-mark manual $savedAptMark; \ apt-mark manual $savedAptMark; \
ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \ ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
@@ -70,7 +71,7 @@ ARG sha256_checksum="abfdc800d97feabbd448df4a2cfa72a954d2f6b013475132b0691ac2563
ARG archive_url="https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz" ARG archive_url="https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz"
ENV LIMESURVEY_VERSION=$version ENV LIMESURVEY_VERSION=$version
# Download, unzip and chmod LimeSurvey from GitHub (defaults to the official LimeSurvey/LimeSurvey repository) # Download, unzip and chmod LimeSurvey from GitHub (defaults to the official LimeSurvey/LimeSurvey repository)
RUN set -ex; \ RUN set -ex; \
curl -sSL "${archive_url}" --output /tmp/limesurvey.tar.gz && \ curl -sSL "${archive_url}" --output /tmp/limesurvey.tar.gz && \
echo "${sha256_checksum} /tmp/limesurvey.tar.gz" | sha256sum -c - && \ echo "${sha256_checksum} /tmp/limesurvey.tar.gz" | sha256sum -c - && \

5
5.0/apache/Dockerfile
View File

@@ -12,6 +12,7 @@ RUN set -ex; \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
# Install PHP Plugins and Configure PHP imap plugin # Install PHP Plugins and Configure PHP imap plugin
# hadolint ignore=SC2086
RUN set -ex; \ RUN set -ex; \
\ \
savedAptMark="$(apt-mark showmanual)"; \ savedAptMark="$(apt-mark showmanual)"; \
@@ -51,7 +52,7 @@ RUN set -ex; \
zip \ zip \
; \ ; \
\ \
# reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies # Reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
apt-mark auto '.*' > /dev/null; \ apt-mark auto '.*' > /dev/null; \
apt-mark manual $savedAptMark; \ apt-mark manual $savedAptMark; \
ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \ ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
@@ -85,7 +86,7 @@ ARG USER=www-data
ARG LISTEN_PORT=8080 ARG LISTEN_PORT=8080
ENV LIMESURVEY_VERSION=$version ENV LIMESURVEY_VERSION=$version
# Download, unzip and chmod LimeSurvey from GitHub (defaults to the official LimeSurvey/LimeSurvey repository) # Download, unzip and chmod LimeSurvey from GitHub (defaults to the official LimeSurvey/LimeSurvey repository)
RUN set -ex; \ RUN set -ex; \
curl -sSL "${archive_url}" --output /tmp/limesurvey.tar.gz && \ curl -sSL "${archive_url}" --output /tmp/limesurvey.tar.gz && \
echo "${sha256_checksum} /tmp/limesurvey.tar.gz" | sha256sum -c - && \ echo "${sha256_checksum} /tmp/limesurvey.tar.gz" | sha256sum -c - && \

3
5.0/fpm-alpine/Dockerfile
View File

@@ -5,6 +5,7 @@ LABEL maintainer="markus@martialblog.de"
RUN apk add --no-cache netcat-openbsd bash RUN apk add --no-cache netcat-openbsd bash
# Install PHP Plugins # Install PHP Plugins
# hadolint ignore=SC2086
RUN set -ex; \ RUN set -ex; \
apk add --no-cache --virtual .build-deps \ apk add --no-cache --virtual .build-deps \
freetype-dev \ freetype-dev \
@@ -42,7 +43,7 @@ RUN set -ex; \
| sort -u \ | sort -u \
| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
)"; \ )"; \
apk add --no-cache --no-network --virtual .limesurvey-phpext-rundeps "${runDeps}"; \ apk add --no-cache --no-network --virtual .limesurvey-phpext-rundeps $runDeps; \
apk del --no-cache --no-network .build-deps apk del --no-cache --no-network .build-deps
ARG version="5.6.21+230518" ARG version="5.6.21+230518"

5
5.0/fpm/Dockerfile
View File

@@ -12,6 +12,7 @@ RUN set -ex; \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
# Install PHP Plugins and Configure PHP imap plugin # Install PHP Plugins and Configure PHP imap plugin
# hadolint ignore=SC2086
RUN set -ex; \ RUN set -ex; \
\ \
savedAptMark="$(apt-mark showmanual)"; \ savedAptMark="$(apt-mark showmanual)"; \
@@ -51,7 +52,7 @@ RUN set -ex; \
zip \ zip \
; \ ; \
\ \
# reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies # Reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
apt-mark auto '.*' > /dev/null; \ apt-mark auto '.*' > /dev/null; \
apt-mark manual $savedAptMark; \ apt-mark manual $savedAptMark; \
ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \ ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
@@ -71,7 +72,7 @@ ARG archive_url="https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar
ARG USER=www-data ARG USER=www-data
ENV LIMESURVEY_VERSION=$version ENV LIMESURVEY_VERSION=$version
# Download, unzip and chmod LimeSurvey from GitHub (defaults to the official LimeSurvey/LimeSurvey repository) # Download, unzip and chmod LimeSurvey from GitHub (defaults to the official LimeSurvey/LimeSurvey repository)
RUN set -ex; \ RUN set -ex; \
curl -sSL "${archive_url}" --output /tmp/limesurvey.tar.gz && \ curl -sSL "${archive_url}" --output /tmp/limesurvey.tar.gz && \
echo "${sha256_checksum} /tmp/limesurvey.tar.gz" | sha256sum -c - && \ echo "${sha256_checksum} /tmp/limesurvey.tar.gz" | sha256sum -c - && \

3
6.0/apache/Dockerfile
View File

@@ -12,6 +12,7 @@ RUN set -ex; \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
# Install PHP Plugins and Configure PHP imap plugin # Install PHP Plugins and Configure PHP imap plugin
# hadolint ignore=SC2086
RUN set -ex; \ RUN set -ex; \
\ \
savedAptMark="$(apt-mark showmanual)"; \ savedAptMark="$(apt-mark showmanual)"; \
@@ -51,7 +52,7 @@ RUN set -ex; \
zip \ zip \
; \ ; \
\ \
# reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies # Reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
apt-mark auto '.*' > /dev/null; \ apt-mark auto '.*' > /dev/null; \
apt-mark manual $savedAptMark; \ apt-mark manual $savedAptMark; \
ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \ ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \

3
6.0/fpm-alpine/Dockerfile
View File

@@ -5,6 +5,7 @@ LABEL maintainer="markus@martialblog.de"
RUN apk add --no-cache netcat-openbsd bash RUN apk add --no-cache netcat-openbsd bash
# Install PHP Plugins # Install PHP Plugins
# hadolint ignore=SC2086
RUN set -ex; \ RUN set -ex; \
apk add --no-cache --virtual .build-deps \ apk add --no-cache --virtual .build-deps \
freetype-dev \ freetype-dev \
@@ -42,7 +43,7 @@ RUN set -ex; \
| sort -u \ | sort -u \
| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
)"; \ )"; \
apk add --no-cache --no-network --virtual .limesurvey-phpext-rundeps "${runDeps}"; \ apk add --no-cache --no-network --virtual .limesurvey-phpext-rundeps $runDeps; \
apk del --no-cache --no-network .build-deps apk del --no-cache --no-network .build-deps
ARG version="6.0.7+230515" ARG version="6.0.7+230515"

3
6.0/fpm/Dockerfile
View File

@@ -12,6 +12,7 @@ RUN set -ex; \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
# Install PHP Plugins and Configure PHP imap plugin # Install PHP Plugins and Configure PHP imap plugin
# hadolint ignore=SC2086
RUN set -ex; \ RUN set -ex; \
\ \
savedAptMark="$(apt-mark showmanual)"; \ savedAptMark="$(apt-mark showmanual)"; \
@@ -51,7 +52,7 @@ RUN set -ex; \
zip \ zip \
; \ ; \
\ \
# reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies # Reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
apt-mark auto '.*' > /dev/null; \ apt-mark auto '.*' > /dev/null; \
apt-mark manual $savedAptMark; \ apt-mark manual $savedAptMark; \
ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \ ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \