Directly include sha256 checksum for stable images

This commit is contained in:
Philipp Holzer 2021-09-08 19:57:35 +02:00
parent f7ff609318
commit ffd8358b21
No known key found for this signature in database
GPG Key ID: 9A28B7D4FF5667BD
9 changed files with 44 additions and 63 deletions

View File

@ -126,29 +126,24 @@ RUN set -ex;\
ENV FRIENDICA_VERSION "2021.04"
ENV FRIENDICA_ADDONS "2021.04"
ENV FRIENDICA_DOWNLOAD_SHA256 "440d3a39cd701c3a4179f89fcb1a7197c3bf03f02c087c4a6e1bbe88932a1ce4"
ENV FRIENDICA_DOWNLOAD_ADDONS_SHA256 "6c798634ce75d25bb71c80a00fcd3b6dd48be3ca2e233ca0f9ed80981cba83af"
RUN set -ex; \
curl -fsSL -o friendica-full-${FRIENDICA_VERSION}.tar.gz \
"https://files.friendi.ca/friendica-full-${FRIENDICA_VERSION}.tar.gz"; \
curl -fsSL -o friendica-full-${FRIENDICA_VERSION}.tar.gz.sum256 \
"https://files.friendi.ca/friendica-full-${FRIENDICA_VERSION}.tar.gz.sum256"; \
sha256sum -c friendica-full-${FRIENDICA_VERSION}.tar.gz.sum256; \
echo "${FRIENDICA_DOWNLOAD_SHA256} *friendica-full-${FRIENDICA_VERSION}.tar.gz" | sha256sum -c; \
tar -xzf friendica-full-${FRIENDICA_VERSION}.tar.gz -C /usr/src/; \
rm friendica-full-${FRIENDICA_VERSION}.tar.gz; \
rm friendica-full-${FRIENDICA_VERSION}.tar.gz.sum256; \
mv -f /usr/src/friendica-full-${FRIENDICA_VERSION}/ /usr/src/friendica; \
chmod 777 /usr/src/friendica/view/smarty3; \
curl -fsSL -o friendica-addons-${FRIENDICA_ADDONS}.tar.gz \
"https://files.friendi.ca/friendica-addons-${FRIENDICA_ADDONS}.tar.gz"; \
curl -fsSL -o friendica-addons-${FRIENDICA_ADDONS}.tar.gz.sum256 \
"https://files.friendi.ca/friendica-addons-${FRIENDICA_ADDONS}.tar.gz.sum256"; \
sha256sum -c friendica-addons-${FRIENDICA_ADDONS}.tar.gz.sum256; \
echo "${FRIENDICA_DOWNLOAD_ADDONS_SHA256} *friendica-addons-${FRIENDICA_ADDONS}.tar.gz" | sha256sum -c; \
mkdir -p /usr/src/friendica/proxy; \
mkdir -p /usr/src/friendica/addon; \
tar -xzf friendica-addons-${FRIENDICA_ADDONS}.tar.gz -C /usr/src/friendica/addon --strip-components=1; \
rm friendica-addons-${FRIENDICA_ADDONS}.tar.gz; \
rm friendica-addons-${FRIENDICA_ADDONS}.tar.gz.sum256;
rm friendica-addons-${FRIENDICA_ADDONS}.tar.gz;
COPY *.sh upgrade.exclude /
COPY config/* /usr/src/friendica/config/

View File

@ -128,29 +128,24 @@ VOLUME /var/www/html
ENV FRIENDICA_VERSION "2021.04"
ENV FRIENDICA_ADDONS "2021.04"
ENV FRIENDICA_DOWNLOAD_SHA256 "440d3a39cd701c3a4179f89fcb1a7197c3bf03f02c087c4a6e1bbe88932a1ce4"
ENV FRIENDICA_DOWNLOAD_ADDONS_SHA256 "6c798634ce75d25bb71c80a00fcd3b6dd48be3ca2e233ca0f9ed80981cba83af"
RUN set -ex; \
curl -fsSL -o friendica-full-${FRIENDICA_VERSION}.tar.gz \
"https://files.friendi.ca/friendica-full-${FRIENDICA_VERSION}.tar.gz"; \
curl -fsSL -o friendica-full-${FRIENDICA_VERSION}.tar.gz.sum256 \
"https://files.friendi.ca/friendica-full-${FRIENDICA_VERSION}.tar.gz.sum256"; \
sha256sum -c friendica-full-${FRIENDICA_VERSION}.tar.gz.sum256; \
echo "${FRIENDICA_DOWNLOAD_SHA256} *friendica-full-${FRIENDICA_VERSION}.tar.gz" | sha256sum -c; \
tar -xzf friendica-full-${FRIENDICA_VERSION}.tar.gz -C /usr/src/; \
rm friendica-full-${FRIENDICA_VERSION}.tar.gz; \
rm friendica-full-${FRIENDICA_VERSION}.tar.gz.sum256; \
mv -f /usr/src/friendica-full-${FRIENDICA_VERSION}/ /usr/src/friendica; \
chmod 777 /usr/src/friendica/view/smarty3; \
curl -fsSL -o friendica-addons-${FRIENDICA_ADDONS}.tar.gz \
"https://files.friendi.ca/friendica-addons-${FRIENDICA_ADDONS}.tar.gz"; \
curl -fsSL -o friendica-addons-${FRIENDICA_ADDONS}.tar.gz.sum256 \
"https://files.friendi.ca/friendica-addons-${FRIENDICA_ADDONS}.tar.gz.sum256"; \
sha256sum -c friendica-addons-${FRIENDICA_ADDONS}.tar.gz.sum256; \
echo "${FRIENDICA_DOWNLOAD_ADDONS_SHA256} *friendica-addons-${FRIENDICA_ADDONS}.tar.gz" | sha256sum -c; \
mkdir -p /usr/src/friendica/proxy; \
mkdir -p /usr/src/friendica/addon; \
tar -xzf friendica-addons-${FRIENDICA_ADDONS}.tar.gz -C /usr/src/friendica/addon --strip-components=1; \
rm friendica-addons-${FRIENDICA_ADDONS}.tar.gz; \
rm friendica-addons-${FRIENDICA_ADDONS}.tar.gz.sum256;
rm friendica-addons-${FRIENDICA_ADDONS}.tar.gz;
COPY *.sh upgrade.exclude /
COPY config/* /usr/src/friendica/config/

View File

@ -117,29 +117,24 @@ VOLUME /var/www/html
ENV FRIENDICA_VERSION "2021.04"
ENV FRIENDICA_ADDONS "2021.04"
ENV FRIENDICA_DOWNLOAD_SHA256 "440d3a39cd701c3a4179f89fcb1a7197c3bf03f02c087c4a6e1bbe88932a1ce4"
ENV FRIENDICA_DOWNLOAD_ADDONS_SHA256 "6c798634ce75d25bb71c80a00fcd3b6dd48be3ca2e233ca0f9ed80981cba83af"
RUN set -ex; \
curl -fsSL -o friendica-full-${FRIENDICA_VERSION}.tar.gz \
"https://files.friendi.ca/friendica-full-${FRIENDICA_VERSION}.tar.gz"; \
curl -fsSL -o friendica-full-${FRIENDICA_VERSION}.tar.gz.sum256 \
"https://files.friendi.ca/friendica-full-${FRIENDICA_VERSION}.tar.gz.sum256"; \
sha256sum -c friendica-full-${FRIENDICA_VERSION}.tar.gz.sum256; \
echo "${FRIENDICA_DOWNLOAD_SHA256} *friendica-full-${FRIENDICA_VERSION}.tar.gz" | sha256sum -c; \
tar -xzf friendica-full-${FRIENDICA_VERSION}.tar.gz -C /usr/src/; \
rm friendica-full-${FRIENDICA_VERSION}.tar.gz; \
rm friendica-full-${FRIENDICA_VERSION}.tar.gz.sum256; \
mv -f /usr/src/friendica-full-${FRIENDICA_VERSION}/ /usr/src/friendica; \
chmod 777 /usr/src/friendica/view/smarty3; \
curl -fsSL -o friendica-addons-${FRIENDICA_ADDONS}.tar.gz \
"https://files.friendi.ca/friendica-addons-${FRIENDICA_ADDONS}.tar.gz"; \
curl -fsSL -o friendica-addons-${FRIENDICA_ADDONS}.tar.gz.sum256 \
"https://files.friendi.ca/friendica-addons-${FRIENDICA_ADDONS}.tar.gz.sum256"; \
sha256sum -c friendica-addons-${FRIENDICA_ADDONS}.tar.gz.sum256; \
echo "${FRIENDICA_DOWNLOAD_ADDONS_SHA256} *friendica-addons-${FRIENDICA_ADDONS}.tar.gz" | sha256sum -c; \
mkdir -p /usr/src/friendica/proxy; \
mkdir -p /usr/src/friendica/addon; \
tar -xzf friendica-addons-${FRIENDICA_ADDONS}.tar.gz -C /usr/src/friendica/addon --strip-components=1; \
rm friendica-addons-${FRIENDICA_ADDONS}.tar.gz; \
rm friendica-addons-${FRIENDICA_ADDONS}.tar.gz.sum256;
rm friendica-addons-${FRIENDICA_ADDONS}.tar.gz;
COPY *.sh upgrade.exclude /
COPY config/* /usr/src/friendica/config/

View File

@ -126,29 +126,24 @@ RUN set -ex;\
ENV FRIENDICA_VERSION "2021.07"
ENV FRIENDICA_ADDONS "2021.07"
ENV FRIENDICA_DOWNLOAD_SHA256 "d57ebb33ff733f0ad023ad63e8992d8f61cec06363b951d00f1452760eeeda12"
ENV FRIENDICA_DOWNLOAD_ADDONS_SHA256 "9752046c5af1003338a668683b24476cfb3f8dfeaef466703492a0883581c790"
RUN set -ex; \
curl -fsSL -o friendica-full-${FRIENDICA_VERSION}.tar.gz \
"https://files.friendi.ca/friendica-full-${FRIENDICA_VERSION}.tar.gz"; \
curl -fsSL -o friendica-full-${FRIENDICA_VERSION}.tar.gz.sum256 \
"https://files.friendi.ca/friendica-full-${FRIENDICA_VERSION}.tar.gz.sum256"; \
sha256sum -c friendica-full-${FRIENDICA_VERSION}.tar.gz.sum256; \
echo "${FRIENDICA_DOWNLOAD_SHA256} *friendica-full-${FRIENDICA_VERSION}.tar.gz" | sha256sum -c; \
tar -xzf friendica-full-${FRIENDICA_VERSION}.tar.gz -C /usr/src/; \
rm friendica-full-${FRIENDICA_VERSION}.tar.gz; \
rm friendica-full-${FRIENDICA_VERSION}.tar.gz.sum256; \
mv -f /usr/src/friendica-full-${FRIENDICA_VERSION}/ /usr/src/friendica; \
chmod 777 /usr/src/friendica/view/smarty3; \
curl -fsSL -o friendica-addons-${FRIENDICA_ADDONS}.tar.gz \
"https://files.friendi.ca/friendica-addons-${FRIENDICA_ADDONS}.tar.gz"; \
curl -fsSL -o friendica-addons-${FRIENDICA_ADDONS}.tar.gz.sum256 \
"https://files.friendi.ca/friendica-addons-${FRIENDICA_ADDONS}.tar.gz.sum256"; \
sha256sum -c friendica-addons-${FRIENDICA_ADDONS}.tar.gz.sum256; \
echo "${FRIENDICA_DOWNLOAD_ADDONS_SHA256} *friendica-addons-${FRIENDICA_ADDONS}.tar.gz" | sha256sum -c; \
mkdir -p /usr/src/friendica/proxy; \
mkdir -p /usr/src/friendica/addon; \
tar -xzf friendica-addons-${FRIENDICA_ADDONS}.tar.gz -C /usr/src/friendica/addon --strip-components=1; \
rm friendica-addons-${FRIENDICA_ADDONS}.tar.gz; \
rm friendica-addons-${FRIENDICA_ADDONS}.tar.gz.sum256;
rm friendica-addons-${FRIENDICA_ADDONS}.tar.gz;
COPY *.sh upgrade.exclude /
COPY config/* /usr/src/friendica/config/

View File

@ -128,29 +128,24 @@ VOLUME /var/www/html
ENV FRIENDICA_VERSION "2021.07"
ENV FRIENDICA_ADDONS "2021.07"
ENV FRIENDICA_DOWNLOAD_SHA256 "d57ebb33ff733f0ad023ad63e8992d8f61cec06363b951d00f1452760eeeda12"
ENV FRIENDICA_DOWNLOAD_ADDONS_SHA256 "9752046c5af1003338a668683b24476cfb3f8dfeaef466703492a0883581c790"
RUN set -ex; \
curl -fsSL -o friendica-full-${FRIENDICA_VERSION}.tar.gz \
"https://files.friendi.ca/friendica-full-${FRIENDICA_VERSION}.tar.gz"; \
curl -fsSL -o friendica-full-${FRIENDICA_VERSION}.tar.gz.sum256 \
"https://files.friendi.ca/friendica-full-${FRIENDICA_VERSION}.tar.gz.sum256"; \
sha256sum -c friendica-full-${FRIENDICA_VERSION}.tar.gz.sum256; \
echo "${FRIENDICA_DOWNLOAD_SHA256} *friendica-full-${FRIENDICA_VERSION}.tar.gz" | sha256sum -c; \
tar -xzf friendica-full-${FRIENDICA_VERSION}.tar.gz -C /usr/src/; \
rm friendica-full-${FRIENDICA_VERSION}.tar.gz; \
rm friendica-full-${FRIENDICA_VERSION}.tar.gz.sum256; \
mv -f /usr/src/friendica-full-${FRIENDICA_VERSION}/ /usr/src/friendica; \
chmod 777 /usr/src/friendica/view/smarty3; \
curl -fsSL -o friendica-addons-${FRIENDICA_ADDONS}.tar.gz \
"https://files.friendi.ca/friendica-addons-${FRIENDICA_ADDONS}.tar.gz"; \
curl -fsSL -o friendica-addons-${FRIENDICA_ADDONS}.tar.gz.sum256 \
"https://files.friendi.ca/friendica-addons-${FRIENDICA_ADDONS}.tar.gz.sum256"; \
sha256sum -c friendica-addons-${FRIENDICA_ADDONS}.tar.gz.sum256; \
echo "${FRIENDICA_DOWNLOAD_ADDONS_SHA256} *friendica-addons-${FRIENDICA_ADDONS}.tar.gz" | sha256sum -c; \
mkdir -p /usr/src/friendica/proxy; \
mkdir -p /usr/src/friendica/addon; \
tar -xzf friendica-addons-${FRIENDICA_ADDONS}.tar.gz -C /usr/src/friendica/addon --strip-components=1; \
rm friendica-addons-${FRIENDICA_ADDONS}.tar.gz; \
rm friendica-addons-${FRIENDICA_ADDONS}.tar.gz.sum256;
rm friendica-addons-${FRIENDICA_ADDONS}.tar.gz;
COPY *.sh upgrade.exclude /
COPY config/* /usr/src/friendica/config/

View File

@ -117,29 +117,24 @@ VOLUME /var/www/html
ENV FRIENDICA_VERSION "2021.07"
ENV FRIENDICA_ADDONS "2021.07"
ENV FRIENDICA_DOWNLOAD_SHA256 "d57ebb33ff733f0ad023ad63e8992d8f61cec06363b951d00f1452760eeeda12"
ENV FRIENDICA_DOWNLOAD_ADDONS_SHA256 "9752046c5af1003338a668683b24476cfb3f8dfeaef466703492a0883581c790"
RUN set -ex; \
curl -fsSL -o friendica-full-${FRIENDICA_VERSION}.tar.gz \
"https://files.friendi.ca/friendica-full-${FRIENDICA_VERSION}.tar.gz"; \
curl -fsSL -o friendica-full-${FRIENDICA_VERSION}.tar.gz.sum256 \
"https://files.friendi.ca/friendica-full-${FRIENDICA_VERSION}.tar.gz.sum256"; \
sha256sum -c friendica-full-${FRIENDICA_VERSION}.tar.gz.sum256; \
echo "${FRIENDICA_DOWNLOAD_SHA256} *friendica-full-${FRIENDICA_VERSION}.tar.gz" | sha256sum -c; \
tar -xzf friendica-full-${FRIENDICA_VERSION}.tar.gz -C /usr/src/; \
rm friendica-full-${FRIENDICA_VERSION}.tar.gz; \
rm friendica-full-${FRIENDICA_VERSION}.tar.gz.sum256; \
mv -f /usr/src/friendica-full-${FRIENDICA_VERSION}/ /usr/src/friendica; \
chmod 777 /usr/src/friendica/view/smarty3; \
curl -fsSL -o friendica-addons-${FRIENDICA_ADDONS}.tar.gz \
"https://files.friendi.ca/friendica-addons-${FRIENDICA_ADDONS}.tar.gz"; \
curl -fsSL -o friendica-addons-${FRIENDICA_ADDONS}.tar.gz.sum256 \
"https://files.friendi.ca/friendica-addons-${FRIENDICA_ADDONS}.tar.gz.sum256"; \
sha256sum -c friendica-addons-${FRIENDICA_ADDONS}.tar.gz.sum256; \
echo "${FRIENDICA_DOWNLOAD_ADDONS_SHA256} *friendica-addons-${FRIENDICA_ADDONS}.tar.gz" | sha256sum -c; \
mkdir -p /usr/src/friendica/proxy; \
mkdir -p /usr/src/friendica/addon; \
tar -xzf friendica-addons-${FRIENDICA_ADDONS}.tar.gz -C /usr/src/friendica/addon --strip-components=1; \
rm friendica-addons-${FRIENDICA_ADDONS}.tar.gz; \
rm friendica-addons-${FRIENDICA_ADDONS}.tar.gz.sum256;
rm friendica-addons-${FRIENDICA_ADDONS}.tar.gz;
COPY *.sh upgrade.exclude /
COPY config/* /usr/src/friendica/config/

View File

@ -127,8 +127,8 @@ VOLUME /var/www/html
ENV FRIENDICA_VERSION "%%VERSION%%"
ENV FRIENDICA_ADDONS "%%VERSION%%"
%%DOWNLOAD_SHA256%%
%%INSTALL_EXTRAS%%
COPY *.sh upgrade.exclude /
COPY config/* /usr/src/friendica/config/

View File

@ -116,8 +116,8 @@ VOLUME /var/www/html
ENV FRIENDICA_VERSION "%%VERSION%%"
ENV FRIENDICA_ADDONS "%%VERSION%%"
%%DOWNLOAD_SHA256%%
%%INSTALL_EXTRAS%%
COPY *.sh upgrade.exclude /
COPY config/* /usr/src/friendica/config/

View File

@ -82,7 +82,7 @@ declare -A pecl_versions=(
)
declare -A install_extras=(
['stable']='\nRUN set -ex; \\\n curl -fsSL -o friendica-full-${FRIENDICA_VERSION}.tar.gz \\\n "https://files.friendi.ca/friendica-full-${FRIENDICA_VERSION}.tar.gz"; \\\n curl -fsSL -o friendica-full-${FRIENDICA_VERSION}.tar.gz.sum256 \\\n "https://files.friendi.ca/friendica-full-${FRIENDICA_VERSION}.tar.gz.sum256"; \\\n sha256sum -c friendica-full-${FRIENDICA_VERSION}.tar.gz.sum256; \\\n tar -xzf friendica-full-${FRIENDICA_VERSION}.tar.gz -C /usr/src/; \\\n rm friendica-full-${FRIENDICA_VERSION}.tar.gz; \\\n rm friendica-full-${FRIENDICA_VERSION}.tar.gz.sum256; \\\n mv -f /usr/src/friendica-full-${FRIENDICA_VERSION}/ /usr/src/friendica; \\\n chmod 777 /usr/src/friendica/view/smarty3; \\\n curl -fsSL -o friendica-addons-${FRIENDICA_ADDONS}.tar.gz \\\n "https://files.friendi.ca/friendica-addons-${FRIENDICA_ADDONS}.tar.gz"; \\\n curl -fsSL -o friendica-addons-${FRIENDICA_ADDONS}.tar.gz.sum256 \\\n "https://files.friendi.ca/friendica-addons-${FRIENDICA_ADDONS}.tar.gz.sum256"; \\\n sha256sum -c friendica-addons-${FRIENDICA_ADDONS}.tar.gz.sum256; \\\n mkdir -p /usr/src/friendica/proxy; \\\n mkdir -p /usr/src/friendica/addon; \\\n tar -xzf friendica-addons-${FRIENDICA_ADDONS}.tar.gz -C /usr/src/friendica/addon --strip-components=1; \\\n rm friendica-addons-${FRIENDICA_ADDONS}.tar.gz; \\\n rm friendica-addons-${FRIENDICA_ADDONS}.tar.gz.sum256;'
['stable']='\nRUN set -ex; \\\n curl -fsSL -o friendica-full-${FRIENDICA_VERSION}.tar.gz \\\n "https://files.friendi.ca/friendica-full-${FRIENDICA_VERSION}.tar.gz"; \\\n echo "${FRIENDICA_DOWNLOAD_SHA256} *friendica-full-${FRIENDICA_VERSION}.tar.gz" \| sha256sum -c; \\\n tar -xzf friendica-full-${FRIENDICA_VERSION}.tar.gz -C /usr/src/; \\\n rm friendica-full-${FRIENDICA_VERSION}.tar.gz; \\\n mv -f /usr/src/friendica-full-${FRIENDICA_VERSION}/ /usr/src/friendica; \\\n chmod 777 /usr/src/friendica/view/smarty3; \\\n curl -fsSL -o friendica-addons-${FRIENDICA_ADDONS}.tar.gz \\\n "https://files.friendi.ca/friendica-addons-${FRIENDICA_ADDONS}.tar.gz"; \\\n echo "${FRIENDICA_DOWNLOAD_ADDONS_SHA256} *friendica-addons-${FRIENDICA_ADDONS}.tar.gz" \| sha256sum -c; \\\n mkdir -p /usr/src/friendica/proxy; \\\n mkdir -p /usr/src/friendica/addon; \\\n tar -xzf friendica-addons-${FRIENDICA_ADDONS}.tar.gz -C /usr/src/friendica/addon --strip-components=1; \\\n rm friendica-addons-${FRIENDICA_ADDONS}.tar.gz;'
['develop']=''
)
@ -103,6 +103,16 @@ function is_hotfix() {
[[ "$1" =~ ^.*-[[:digit:]]+$ ]]
}
function get_sha256_string() {
install_type="$1"
version="${2,,}"
if [[ $install_type == "develop" ]]; then
echo ""
else
echo "ENV FRIENDICA_DOWNLOAD_SHA256 \"$(curl -fsSL https://files.friendi.ca/friendica-full-${version}.tar.gz.sum256 | cut -d' ' -f1)\"\nENV FRIENDICA_DOWNLOAD_ADDONS_SHA256 \"$(curl -fsSL https://files.friendi.ca/friendica-addons-${version}.tar.gz.sum256 | cut -d' ' -f1)\""
fi
}
function create_variant() {
dockerName=${1,,}
dir="$dockerName/$variant"
@ -129,6 +139,7 @@ function create_variant() {
s/%%VERSION%%/'"${2:-${1}}"'/g;
s/%%CMD%%/'"${cmd[$variant]}"'/g;
s|%%VARIANT_EXTRAS%%|'"${extras[$variant]}"'|g;
s|%%DOWNLOAD_SHA256%%|'"$(get_sha256_string $install_type ${2:-${1}})"'|g;
s|%%INSTALL_EXTRAS%%|'"${install_extras[$install_type]}"'|g;
s/%%APCU_VERSION%%/'"${pecl_versions[APCu]}"'/g;
s/%%IMAGICK_VERSION%%/'"${pecl_versions[imagick]}"'/g;