Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Standard base #22

Merged
merged 4 commits into from
Aug 22, 2022
Merged

Standard base #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6369539
Use standard nginx.conf from lsio alpine nginx base image
nemchik Oct 14, 2021
887556c
Add default location migration
nemchik Aug 20, 2022
f5adc3e
Keep /config volume consistently
nemchik Aug 21, 2022
72646bd
Keep /config volume consistently
nemchik Aug 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 37 additions & 35 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.14
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.15

# set version label
ARG BUILD_DATE
Expand All @@ -11,35 +11,37 @@ RUN \
echo "**** install runtime packages ****" && \
apk add -U --upgrade --no-cache \
curl \
php7-bcmath \
php7-bz2 \
php7-cli \
php7-ctype \
php7-curl \
php7-dom \
php7-fileinfo \
php7-gd \
php7-gettext \
php7-gmp \
php7-json \
php7-iconv \
php7-mbstring \
php7-mcrypt \
php7-mysqli \
php7-openssl \
php7-pdo \
php7-pdo_dblib \
php7-pdo_mysql \
php7-pecl-apcu \
php7-pecl-memcached \
php7-phar \
php7-soap \
php7-xmlreader \
php7-xmlrpc \
php7-zip \
php8-bcmath \
php8-bz2 \
php8-cli \
php8-ctype \
php8-curl \
php8-dom \
php8-fileinfo \
php8-gd \
php8-gettext \
php8-gmp \
php8-iconv \
php8-json \
php8-mbstring \
php8-mysqli \
php8-openssl \
php8-pdo \
php8-pdo_dblib \
php8-pdo_mysql \
php8-pecl-apcu \
php8-pecl-mcrypt \
php8-pecl-memcached \
php8-phar \
php8-soap \
php8-xmlreader \
php8-zip \
unzip && \
apk add --no-cache \
--repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing \
php8-pecl-xmlrpc && \
echo "**** install projectsend ****" && \
mkdir -p /app/projectsend && \
mkdir -p /app/www/public && \
if [ -z ${PROJECTSEND_VERSION+x} ]; then \
PROJECTSEND_VERSION=$(curl -sX GET "https://api.github.com/repos/projectsend/projectsend/releases/latest" \
| awk '/tag_name/{print $4;exit}' FS='[""]'); \
Expand All @@ -49,16 +51,16 @@ RUN \
"https://github.com/projectsend/projectsend/releases/download/${PROJECTSEND_VERSION}/projectsend-${PROJECTSEND_VERSION}.zip" && \
unzip \
/tmp/projectsend.zip -d \
/app/projectsend && \
mv /app/projectsend/upload /defaults/ && \
mv /app/projectsend /app/projectsend-tmp && \
/app/www/public && \
mv /app/www/public/upload /defaults/ && \
mv /app/www/public /app/www/public-tmp && \
echo "**** cleanup ****" && \
rm -rf \
/tmp/*

# add local files
# copy local files
COPY root/ /

# ports and volumes
EXPOSE 80
VOLUME /config /data
# ports and volumes
EXPOSE 80 443
VOLUME /config
72 changes: 37 additions & 35 deletions Dockerfile.aarch64
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.14
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.15

# set version label
ARG BUILD_DATE
Expand All @@ -11,35 +11,37 @@ RUN \
echo "**** install runtime packages ****" && \
apk add -U --upgrade --no-cache \
curl \
php7-bcmath \
php7-bz2 \
php7-cli \
php7-ctype \
php7-curl \
php7-dom \
php7-fileinfo \
php7-gd \
php7-gettext \
php7-gmp \
php7-json \
php7-iconv \
php7-mbstring \
php7-mcrypt \
php7-mysqli \
php7-openssl \
php7-pdo \
php7-pdo_dblib \
php7-pdo_mysql \
php7-pecl-apcu \
php7-pecl-memcached \
php7-phar \
php7-soap \
php7-xmlreader \
php7-xmlrpc \
php7-zip \
php8-bcmath \
php8-bz2 \
php8-cli \
php8-ctype \
php8-curl \
php8-dom \
php8-fileinfo \
php8-gd \
php8-gettext \
php8-gmp \
php8-iconv \
php8-json \
php8-mbstring \
php8-mysqli \
php8-openssl \
php8-pdo \
php8-pdo_dblib \
php8-pdo_mysql \
php8-pecl-apcu \
php8-pecl-mcrypt \
php8-pecl-memcached \
php8-phar \
php8-soap \
php8-xmlreader \
php8-zip \
unzip && \
apk add --no-cache \
--repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing \
php8-pecl-xmlrpc && \
echo "**** install projectsend ****" && \
mkdir -p /app/projectsend && \
mkdir -p /app/www/public && \
if [ -z ${PROJECTSEND_VERSION+x} ]; then \
PROJECTSEND_VERSION=$(curl -sX GET "https://api.github.com/repos/projectsend/projectsend/releases/latest" \
| awk '/tag_name/{print $4;exit}' FS='[""]'); \
Expand All @@ -49,16 +51,16 @@ RUN \
"https://github.com/projectsend/projectsend/releases/download/${PROJECTSEND_VERSION}/projectsend-${PROJECTSEND_VERSION}.zip" && \
unzip \
/tmp/projectsend.zip -d \
/app/projectsend && \
mv /app/projectsend/upload /defaults/ && \
mv /app/projectsend /app/projectsend-tmp && \
/app/www/public && \
mv /app/www/public/upload /defaults/ && \
mv /app/www/public /app/www/public-tmp && \
echo "**** cleanup ****" && \
rm -rf \
/tmp/*

# add local files
# copy local files
COPY root/ /

# ports and volumes
EXPOSE 80
VOLUME /config /data
# ports and volumes
EXPOSE 80 443
VOLUME /config
72 changes: 37 additions & 35 deletions Dockerfile.armhf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm32v7-3.14
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm32v7-3.15

# set version label
ARG BUILD_DATE
Expand All @@ -11,35 +11,37 @@ RUN \
echo "**** install runtime packages ****" && \
apk add -U --upgrade --no-cache \
curl \
php7-bcmath \
php7-bz2 \
php7-cli \
php7-ctype \
php7-curl \
php7-dom \
php7-fileinfo \
php7-gd \
php7-gettext \
php7-gmp \
php7-json \
php7-iconv \
php7-mbstring \
php7-mcrypt \
php7-mysqli \
php7-openssl \
php7-pdo \
php7-pdo_dblib \
php7-pdo_mysql \
php7-pecl-apcu \
php7-pecl-memcached \
php7-phar \
php7-soap \
php7-xmlreader \
php7-xmlrpc \
php7-zip \
php8-bcmath \
php8-bz2 \
php8-cli \
php8-ctype \
php8-curl \
php8-dom \
php8-fileinfo \
php8-gd \
php8-gettext \
php8-gmp \
php8-iconv \
php8-json \
php8-mbstring \
php8-mysqli \
php8-openssl \
php8-pdo \
php8-pdo_dblib \
php8-pdo_mysql \
php8-pecl-apcu \
php8-pecl-mcrypt \
php8-pecl-memcached \
php8-phar \
php8-soap \
php8-xmlreader \
php8-zip \
unzip && \
apk add --no-cache \
--repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing \
php8-pecl-xmlrpc && \
echo "**** install projectsend ****" && \
mkdir -p /app/projectsend && \
mkdir -p /app/www/public && \
if [ -z ${PROJECTSEND_VERSION+x} ]; then \
PROJECTSEND_VERSION=$(curl -sX GET "https://api.github.com/repos/projectsend/projectsend/releases/latest" \
| awk '/tag_name/{print $4;exit}' FS='[""]'); \
Expand All @@ -49,16 +51,16 @@ RUN \
"https://github.com/projectsend/projectsend/releases/download/${PROJECTSEND_VERSION}/projectsend-${PROJECTSEND_VERSION}.zip" && \
unzip \
/tmp/projectsend.zip -d \
/app/projectsend && \
mv /app/projectsend/upload /defaults/ && \
mv /app/projectsend /app/projectsend-tmp && \
/app/www/public && \
mv /app/www/public/upload /defaults/ && \
mv /app/www/public /app/www/public-tmp && \
echo "**** cleanup ****" && \
rm -rf \
/tmp/*

# add local files
# copy local files
COPY root/ /

# ports and volumes
EXPOSE 80
VOLUME /config /data
# ports and volumes
EXPOSE 80 443
VOLUME /config
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64

## Versions

* **20.08.22:** - Rebasing to alpine 3.15 with php8. Restructure nginx configs ([see changes announcement](https://info.linuxserver.io/issues/2022-08-20-nginx-base)).
* **24.06.21:** - Rebasing to alpine 3.14, switch to nginx
* **23.01.21:** - Rebasing to alpine 3.13.
* **01.06.20:** - Rebasing to alpine 3.12.
Expand Down
18 changes: 9 additions & 9 deletions package_versions.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
alpine-baselayout-3.2.0-r16
alpine-keys-2.4-r0
apache2-utils-2.4.54-r0
apache2-utils-2.4.51-r0
apk-tools-2.12.7-r0
apr-1.7.0-r1
apr-util-1.6.1-r7
argon2-libs-20190702-r1
bash-5.1.16-r0
brotli-libs-1.0.9-r5
busybox-1.33.1-r8
ca-certificates-20220614-r0
ca-certificates-bundle-20220614-r0
busybox-1.33.1-r6
ca-certificates-20191127-r5
ca-certificates-bundle-20191127-r5
coreutils-8.32-r2
curl-7.79.1-r2
expat-2.4.7-r0
Expand Down Expand Up @@ -43,7 +43,7 @@ libsasl-2.1.28-r0
libsm-1.2.3-r0
libssl1.1-1.1.1q-r0
libstdc++-10.3.1_git20210424-r2
libuuid-2.37.4-r0
libuuid-2.37.2-r0
libwebp-1.2.0-r2
libx11-1.7.2-r0
libxau-1.0.9-r0
Expand All @@ -62,11 +62,11 @@ nano-5.7-r2
ncurses-libs-6.2_p20210612-r1
ncurses-terminfo-base-6.2_p20210612-r1
nghttp2-libs-1.43.0-r0
nginx-1.20.2-r1
nginx-1.20.2-r0
oniguruma-6.9.7.1-r0
openssl-1.1.1q-r0
pcre-8.44-r0
pcre2-10.36-r1
pcre2-10.36-r0
php7-7.4.26-r0
php7-bcmath-7.4.26-r0
php7-bz2-7.4.26-r0
Expand Down Expand Up @@ -108,8 +108,8 @@ s6-ipcserver-2.10.0.3-r0
scanelf-1.3.2-r0
shadow-4.8.1-r0
skalibs-2.10.0.3-r0
ssl_client-1.33.1-r8
tzdata-2022a-r0
ssl_client-1.33.1-r6
tzdata-2021e-r0
unixodbc-2.3.9-r1
unzip-6.0-r9
utmps-0.1.0.2-r0
Expand Down
1 change: 1 addition & 0 deletions readme-vars.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ app_setup_block: |
# changelog
changelogs:
- { date: "20.08.22:", desc: "Rebasing to alpine 3.15 with php8. Restructure nginx configs ([see changes announcement](https://info.linuxserver.io/issues/2022-08-20-nginx-base))." }
- { date: "24.06.21:", desc: "Rebasing to alpine 3.14, switch to nginx"}
- { date: "23.01.21:", desc: "Rebasing to alpine 3.13." }
- { date: "01.06.20:", desc: "Rebasing to alpine 3.12." }
Expand Down
40 changes: 40 additions & 0 deletions root/app/projectsend/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
<html>
<head>
<title>Upgrade Required!</title>
<style>
body{
font-family: Helvetica, Arial, sans-serif;
}
.message{
width:440px;
padding:20px 40px;
margin:0 auto;
background-color:#f9f9f9;
border:1px solid #ddd;
color: #1e3d62;
}
center{
margin:40px 0;
}
h1{
font-size: 18px;
line-height: 26px;
}
p{
font-size: 12px;
}
a{
color: rgb(207, 48, 139);
}
</style>
</head>
<body>
<div class="message">
<h1>Upgrade Required!</h1>
<p>The application inside this image has been moved to a new folder.</p>
<p>You will need to update your <strong>/config/nginx/nginx.conf</strong> and <strong>/config/nginx/site-confs/default.conf</strong> in order for the application to work.</p>
<p>New config samples are located at <strong>/config/nginx/nginx.conf.sample</strong> and <strong>/config/nginx/site-confs/default.conf.sample</strong></p>
<p>Please review our announcement: <a target="_blank" href="https://info.linuxserver.io/issues/2022-08-20-nginx-base/">Significant changes to nginx based images</a></p>
</div>
</body>
</html>
Loading