friendica
/
docker
mirror of https://github.com/friendica/docker
2
0
Fork 0
Code Issues Releases Wiki Activity

[Hotfix] Switch full archive path

This commit is contained in:
Philipp Holzer 2020-07-12 22:20:07 +02:00
parent b2c64a6ce8
commit 2e38177e2e
No known key found for this signature in database
GPG Key ID: 9A28B7D4FF5667BD
9 changed files with 4 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
2020.07/apache/Dockerfile
View File

@ -133,13 +133,11 @@ RUN set -ex;\
a2enconf remoteip
ENV FRIENDICA_VERSION 2020.07
ENV FRIENDICA_VERSION_YEAR 2020
ENV FRIENDICA_VERSION_MONTH 07
ENV FRIENDICA_ADDONS 2020.07
RUN set -ex; \
curl -fsSL -o friendica.tar.gz \
"https://friendi.ca/wp-content/uploads/${FRIENDICA_VERSION_YEAR}/${FRIENDICA_VERSION_MONTH}/friendica-full-${FRIENDICA_VERSION}.tar.gz"; \
"https://github.com/friendica/friendica/releases/download/${FRIENDICA_VERSION}/friendica-full-${FRIENDICA_VERSION}.tar.gz"; \
tar -xzf friendica.tar.gz -C /usr/src/; \
rm friendica.tar.gz; \
mv -f /usr/src/friendica-full-${FRIENDICA_VERSION}/ /usr/src/friendica; \

4
2020.07/fpm-alpine/Dockerfile
View File

@ -99,13 +99,11 @@ VOLUME /var/www/html
ENV FRIENDICA_VERSION 2020.07
ENV FRIENDICA_VERSION_YEAR 2020
ENV FRIENDICA_VERSION_MONTH 07
ENV FRIENDICA_ADDONS 2020.07
RUN set -ex; \
curl -fsSL -o friendica.tar.gz \
"https://friendi.ca/wp-content/uploads/${FRIENDICA_VERSION_YEAR}/${FRIENDICA_VERSION_MONTH}/friendica-full-${FRIENDICA_VERSION}.tar.gz"; \
"https://github.com/friendica/friendica/releases/download/${FRIENDICA_VERSION}/friendica-full-${FRIENDICA_VERSION}.tar.gz"; \
tar -xzf friendica.tar.gz -C /usr/src/; \
rm friendica.tar.gz; \
mv -f /usr/src/friendica-full-${FRIENDICA_VERSION}/ /usr/src/friendica; \

4
2020.07/fpm/Dockerfile
View File

@ -124,13 +124,11 @@ VOLUME /var/www/html
ENV FRIENDICA_VERSION 2020.07
ENV FRIENDICA_VERSION_YEAR 2020
ENV FRIENDICA_VERSION_MONTH 07
ENV FRIENDICA_ADDONS 2020.07
RUN set -ex; \
curl -fsSL -o friendica.tar.gz \
"https://friendi.ca/wp-content/uploads/${FRIENDICA_VERSION_YEAR}/${FRIENDICA_VERSION_MONTH}/friendica-full-${FRIENDICA_VERSION}.tar.gz"; \
"https://github.com/friendica/friendica/releases/download/${FRIENDICA_VERSION}/friendica-full-${FRIENDICA_VERSION}.tar.gz"; \
tar -xzf friendica.tar.gz -C /usr/src/; \
rm friendica.tar.gz; \
mv -f /usr/src/friendica-full-${FRIENDICA_VERSION}/ /usr/src/friendica; \

2
2020.09-dev/apache/Dockerfile
View File

@ -133,8 +133,6 @@ RUN set -ex;\
a2enconf remoteip
ENV FRIENDICA_VERSION 2020.09-dev
ENV FRIENDICA_VERSION_YEAR 2020
ENV FRIENDICA_VERSION_MONTH 09-dev
ENV FRIENDICA_ADDONS 2020.09-dev

2
2020.09-dev/fpm-alpine/Dockerfile
View File

@ -99,8 +99,6 @@ VOLUME /var/www/html
ENV FRIENDICA_VERSION 2020.09-dev
ENV FRIENDICA_VERSION_YEAR 2020
ENV FRIENDICA_VERSION_MONTH 09-dev
ENV FRIENDICA_ADDONS 2020.09-dev

2
2020.09-dev/fpm/Dockerfile
View File

@ -124,8 +124,6 @@ VOLUME /var/www/html
ENV FRIENDICA_VERSION 2020.09-dev
ENV FRIENDICA_VERSION_YEAR 2020
ENV FRIENDICA_VERSION_MONTH 09-dev
ENV FRIENDICA_ADDONS 2020.09-dev

2
Dockerfile-alpine.template
View File

@ -98,8 +98,6 @@ VOLUME /var/www/html
%%VARIANT_EXTRAS%%
ENV FRIENDICA_VERSION %%VERSION%%
ENV FRIENDICA_VERSION_YEAR %%VERSION_YEAR%%
ENV FRIENDICA_VERSION_MONTH %%VERSION_MONTH%%
ENV FRIENDICA_ADDONS %%VERSION%%
%%INSTALL_EXTRAS%%

2
Dockerfile-debian.template
View File

@ -123,8 +123,6 @@ VOLUME /var/www/html
%%VARIANT_EXTRAS%%
ENV FRIENDICA_VERSION %%VERSION%%
ENV FRIENDICA_VERSION_YEAR %%VERSION_YEAR%%
ENV FRIENDICA_VERSION_MONTH %%VERSION_MONTH%%
ENV FRIENDICA_ADDONS %%VERSION%%
%%INSTALL_EXTRAS%%

7
update.sh
View File

@ -82,7 +82,7 @@ declare -A pecl_versions=(
)
declare -A install_extras=(
['stable']='\nRUN set -ex; \\\n curl -fsSL -o friendica.tar.gz \\\n "https://friendi.ca/wp-content/uploads/${FRIENDICA_VERSION_YEAR}/${FRIENDICA_VERSION_MONTH}/friendica-full-${FRIENDICA_VERSION}.tar.gz"; \\\n tar -xzf friendica.tar.gz -C /usr/src/; \\\n rm friendica.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.tar.gz \\\n "https://github.com/friendica/friendica-addons/archive/${FRIENDICA_ADDONS}.tar.gz"; \\\n mkdir -p /usr/src/friendica/proxy; \\\n mkdir -p /usr/src/friendica/addon; \\\n tar -xzf friendica_addons.tar.gz -C /usr/src/friendica/addon --strip-components=1; \\\n rm friendica_addons.tar.gz;'
['stable']='\nRUN set -ex; \\\n curl -fsSL -o friendica.tar.gz \\\n "https://github.com/friendica/friendica/releases/download/${FRIENDICA_VERSION}/friendica-full-${FRIENDICA_VERSION}.tar.gz"; \\\n tar -xzf friendica.tar.gz -C /usr/src/; \\\n rm friendica.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.tar.gz \\\n "https://github.com/friendica/friendica-addons/archive/${FRIENDICA_ADDONS}.tar.gz"; \\\n mkdir -p /usr/src/friendica/proxy; \\\n mkdir -p /usr/src/friendica/addon; \\\n tar -xzf friendica_addons.tar.gz -C /usr/src/friendica/addon --strip-components=1; \\\n rm friendica_addons.tar.gz;'
['develop']=''
)
@ -117,9 +117,6 @@ function create_variant() {
install_type='develop'
fi
# Get Year / Month of the Version string
VERSION_PARTS=(${1//./ })
echo "updating $1 [$install_type] $variant"
# Replace the variables.
@ -127,8 +124,6 @@ function create_variant() {
s/%%PHP_VERSION%%/'"${php_version[$version]-${php_version[default]}}"'/g;
s/%%VARIANT%%/'"$variant"'/g;
s/%%VERSION%%/'"$1"'/g;
s/%%VERSION_YEAR%%/'"${VERSION_PARTS[0]}"'/g;
s/%%VERSION_MONTH%%/'"${VERSION_PARTS[1]}"'/g;
s/%%CMD%%/'"${cmd[$variant]}"'/g;
s|%%VARIANT_EXTRAS%%|'"${extras[$variant]}"'|g;
s|%%INSTALL_EXTRAS%%|'"${install_extras[$install_type]}"'|g;