Bot Updating Package Versions

Dockerfile

@@ -1,4 +1,3 @@
-FROM lsiobase/cloud9:files-alpine as c9files
 FROM lsiobase/nginx:3.10
 
 # set version label
@@ -11,30 +10,7 @@ LABEL maintainer="aptalca"
 # environment settings
 ENV S6_BEHAVIOUR_IF_STAGE2_FAILS=2
 
-# cloud9
-COPY --from=c9files /buildout/ /
-
 RUN \
- echo "**** install dev packages ****" && \
- apk add --no-cache \
-	c-ares \
-	curl \
-	git \
-	gnupg \
-	http-parser \
-	libevent \
-	libevent \
-	libstdc++ \
-	libuv \
-	sudo && \
- echo "****  user perms ****" && \
- usermod -aG wheel \
-	abc && \
- echo "auth       sufficient   pam_shells.so" > /etc/pam.d/chsh && \
- chsh abc -s /bin/bash && \
- sed -e \
-	's/# %wheel ALL=(ALL) NOPASSWD: ALL/%wheel ALL=(ALL) NOPASSWD: ALL/g' \
-	-i /etc/sudoers && \
  echo "**** install runtime packages ****" && \
  apk add --no-cache \
 	curl \
@@ -45,27 +21,14 @@ RUN \
 	tar && \
  echo "**** install heimdall ****" && \
  mkdir -p \
-	/c9sdk/build/standalone \
+	/heimdall && \
-	/var/www/localhost/heimdall && \
+ if [ -z ${HEIMDALL_RELEASE+x} ]; then \
- git clone \
+ 	HEIMDALL_RELEASE=$(curl -sX GET "https://api.github.com/repos/linuxserver/Heimdall/commits/master" \
-	https://github.com/linuxserver/Heimdall.git \
+	| awk '/sha/{print $4;exit}' FS='[""]'); \
-	/var/www/localhost/heimdall && \
+ fi && \
- echo "**** dev setup and permissions ****" && \
+ curl -o \
- echo -e \
+	/heimdall/heimdall.tar.gz -L \
-	'\n# Heimdall user authorization\nfastcgi_param  PHP_AUTH_USER $remote_user;\nfastcgi_param  PHP_AUTH_PW $http_authorization;' >> \
+	"https://github.com/linuxserver/Heimdall/archive/${HEIMDALL_RELEASE}.tar.gz" && \
-        /etc/nginx/fastcgi_params && \
- cp \
-        /var/www/localhost/heimdall/.env.example \
-        /var/www/localhost/heimdall/.env && \
- php /var/www/localhost/heimdall/artisan key:generate && \
- sed -i \
-	's/QUEUE_DRIVER=sync/QUEUE_DRIVER=database/' \
-	/var/www/localhost/heimdall/.env && \
- chown -R abc:abc \
-	/c9sdk/build/standalone \
-	/c9bins \
-	/config \
-	/var/www/localhost/heimdall && \
  echo "**** cleanup ****" && \
  rm -rf \
 	/tmp/*

Dockerfile.aarch64

@@ -1,4 +1,3 @@
-FROM lsiobase/cloud9:arm64v8-files-alpine as c9files
 FROM lsiobase/nginx:arm64v8-3.10
 
 # set version label
@@ -11,30 +10,7 @@ LABEL maintainer="aptalca"
 # environment settings
 ENV S6_BEHAVIOUR_IF_STAGE2_FAILS=2
 
-# cloud9
-COPY --from=c9files /buildout/ /
-
 RUN \
- echo "**** install dev packages ****" && \
- apk add --no-cache \
-	c-ares \
-	curl \
-	git \
-	gnupg \
-	http-parser \
-	libevent \
-	libevent \
-	libstdc++ \
-	libuv \
-	sudo && \
- echo "****  user perms ****" && \
- usermod -aG wheel \
-	abc && \
- echo "auth       sufficient   pam_shells.so" > /etc/pam.d/chsh && \
- chsh abc -s /bin/bash && \
- sed -e \
-	's/# %wheel ALL=(ALL) NOPASSWD: ALL/%wheel ALL=(ALL) NOPASSWD: ALL/g' \
-	-i /etc/sudoers && \
  echo "**** install runtime packages ****" && \
  apk add --no-cache \
 	curl \
@@ -45,27 +21,14 @@ RUN \
 	tar && \
  echo "**** install heimdall ****" && \
  mkdir -p \
-	/c9sdk/build/standalone \
+	/heimdall && \
-	/var/www/localhost/heimdall && \
+ if [ -z ${HEIMDALL_RELEASE+x} ]; then \
- git clone \
+ 	HEIMDALL_RELEASE=$(curl -sX GET "https://api.github.com/repos/linuxserver/Heimdall/commits/master" \
-	https://github.com/linuxserver/Heimdall.git \
+	| awk '/sha/{print $4;exit}' FS='[""]'); \
-	/var/www/localhost/heimdall && \
+ fi && \
- echo "**** dev setup and permissions ****" && \
+ curl -o \
- echo -e \
+	/heimdall/heimdall.tar.gz -L \
-	'\n# Heimdall user authorization\nfastcgi_param  PHP_AUTH_USER $remote_user;\nfastcgi_param  PHP_AUTH_PW $http_authorization;' >> \
+	"https://github.com/linuxserver/Heimdall/archive/${HEIMDALL_RELEASE}.tar.gz" && \
-        /etc/nginx/fastcgi_params && \
- cp \
-        /var/www/localhost/heimdall/.env.example \
-        /var/www/localhost/heimdall/.env && \
- php /var/www/localhost/heimdall/artisan key:generate && \
- sed -i \
-	's/QUEUE_DRIVER=sync/QUEUE_DRIVER=database/' \
-	/var/www/localhost/heimdall/.env && \
- chown -R abc:abc \
-	/c9sdk/build/standalone \
-	/c9bins \
-	/config \
-	/var/www/localhost/heimdall && \
  echo "**** cleanup ****" && \
  rm -rf \
 	/tmp/*

Dockerfile.armhf

@@ -1,4 +1,3 @@
-FROM lsiobase/cloud9:arm32v7-files-alpine as c9files
 FROM lsiobase/nginx:arm32v7-3.10
 
 # set version label
@@ -11,30 +10,7 @@ LABEL maintainer="aptalca"
 # environment settings
 ENV S6_BEHAVIOUR_IF_STAGE2_FAILS=2
 
-# cloud9
-COPY --from=c9files /buildout/ /
-
 RUN \
- echo "**** install dev packages ****" && \
- apk add --no-cache \
-	c-ares \
-	curl \
-	git \
-	gnupg \
-	http-parser \
-	libevent \
-	libevent \
-	libstdc++ \
-	libuv \
-	sudo && \
- echo "****  user perms ****" && \
- usermod -aG wheel \
-	abc && \
- echo "auth       sufficient   pam_shells.so" > /etc/pam.d/chsh && \
- chsh abc -s /bin/bash && \
- sed -e \
-	's/# %wheel ALL=(ALL) NOPASSWD: ALL/%wheel ALL=(ALL) NOPASSWD: ALL/g' \
-	-i /etc/sudoers && \
  echo "**** install runtime packages ****" && \
  apk add --no-cache \
 	curl \
@@ -45,27 +21,14 @@ RUN \
 	tar && \
  echo "**** install heimdall ****" && \
  mkdir -p \
-	/c9sdk/build/standalone \
+	/heimdall && \
-	/var/www/localhost/heimdall && \
+ if [ -z ${HEIMDALL_RELEASE+x} ]; then \
- git clone \
+ 	HEIMDALL_RELEASE=$(curl -sX GET "https://api.github.com/repos/linuxserver/Heimdall/commits/master" \
-	https://github.com/linuxserver/Heimdall.git \
+	| awk '/sha/{print $4;exit}' FS='[""]'); \
-	/var/www/localhost/heimdall && \
+ fi && \
- echo "**** dev setup and permissions ****" && \
+ curl -o \
- echo -e \
+	/heimdall/heimdall.tar.gz -L \
-	'\n# Heimdall user authorization\nfastcgi_param  PHP_AUTH_USER $remote_user;\nfastcgi_param  PHP_AUTH_PW $http_authorization;' >> \
+	"https://github.com/linuxserver/Heimdall/archive/${HEIMDALL_RELEASE}.tar.gz" && \
-        /etc/nginx/fastcgi_params && \
- cp \
-        /var/www/localhost/heimdall/.env.example \
-        /var/www/localhost/heimdall/.env && \
- php /var/www/localhost/heimdall/artisan key:generate && \
- sed -i \
-	's/QUEUE_DRIVER=sync/QUEUE_DRIVER=database/' \
-	/var/www/localhost/heimdall/.env && \
- chown -R abc:abc \
-	/c9sdk/build/standalone \
-	/c9bins \
-	/config \
-	/var/www/localhost/heimdall && \
  echo "**** cleanup ****" && \
  rm -rf \
 	/tmp/*

README.md

@@ -194,7 +194,6 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
-* **26.07.19:** - Modify development branch to include integrated IDE.
 * **15.07.19:** - Save laravel.log to /config, install heimdall during first start.
 * **28.06.19:** - Rebasing to alpine 3.10.
 * **23.03.19:** - Switching to new Base images, shift to arm32v7 tag.

package_versions.txt

@@ -1,16 +1,17 @@
 alpine-baselayout-3.1.2-r0
 alpine-keys-2.1-r2
 apache2-utils-2.4.39-r0
-apk-tools-2.10.4-r1
+apk-tools-2.10.4-r2
 apr-1.6.5-r0
 apr-util-1.6.1-r6
+argon2-libs-20171227-r2
 bash-5.0.0-r0
 busybox-1.30.1-r2
 ca-certificates-20190108-r0
 ca-certificates-cacert-20190108-r0
 coreutils-8.31-r0
 curl-7.65.1-r0
-expat-2.2.6-r0
+expat-2.2.7-r0
 git-2.22.0-r0
 libacl-2.2.52-r6
 libattr-2.4.48-r0
@@ -28,33 +29,33 @@ libxml2-2.9.9-r2
 libzip-1.5.2-r0
 linux-pam-1.3.0-r1
 logrotate-3.15.0-r0
-musl-1.1.22-r2
+musl-1.1.22-r3
-musl-utils-1.1.22-r2
+musl-utils-1.1.22-r3
 nano-4.3-r0
 ncurses-libs-6.1_p20190518-r0
 ncurses-terminfo-6.1_p20190518-r0
 ncurses-terminfo-base-6.1_p20190518-r0
 nghttp2-libs-1.38.0-r0
-nginx-1.16.0-r2
+nginx-1.16.1-r0
 openssl-1.1.1c-r0
 pcre-8.43-r0
 pcre2-10.33-r0
-php7-7.3.6-r0
+php7-7.3.8-r0
-php7-common-7.3.6-r0
+php7-common-7.3.8-r0
-php7-ctype-7.3.7-r0
+php7-ctype-7.3.8-r0
-php7-fileinfo-7.3.6-r0
+php7-fileinfo-7.3.8-r0
-php7-fpm-7.3.6-r0
+php7-fpm-7.3.8-r0
-php7-json-7.3.6-r0
+php7-json-7.3.8-r0
-php7-mbstring-7.3.6-r0
+php7-mbstring-7.3.8-r0
-php7-openssl-7.3.6-r0
+php7-openssl-7.3.8-r0
-php7-pdo-7.3.7-r0
+php7-pdo-7.3.8-r0
-php7-pdo_sqlite-7.3.7-r0
+php7-pdo_sqlite-7.3.8-r0
-php7-session-7.3.6-r0
+php7-session-7.3.8-r0
-php7-simplexml-7.3.6-r0
+php7-simplexml-7.3.8-r0
-php7-tokenizer-7.3.7-r0
+php7-tokenizer-7.3.8-r0
-php7-xml-7.3.6-r0
+php7-xml-7.3.8-r0
-php7-xmlwriter-7.3.6-r0
+php7-xmlwriter-7.3.8-r0
-php7-zip-7.3.7-r0
+php7-zip-7.3.8-r0
 popt-1.16-r7
 readline-8.0.0-r0
 scanelf-1.2.3-r0

readme-vars.yml

@@ -52,7 +52,6 @@ app_setup_block: |
 
 # changelog
 changelogs:
-  - { date: "26.07.19:", desc: "Modify development branch to include integrated IDE." }
   - { date: "15.07.19:", desc: "Save laravel.log to /config, install heimdall during first start." }
   - { date: "28.06.19:", desc: "Rebasing to alpine 3.10." }
   - { date: "23.03.19:", desc: "Switching to new Base images, shift to arm32v7 tag." }

root/etc/cont-init.d/50-config

@@ -0,0 +1,52 @@
+#!/usr/bin/with-contenv bash
+
+# make our folders
+mkdir -p \
+	/config/www/{backgrounds,icons,avatars,SupportedApps} \
+	/var/www/localhost/heimdall \
+	/config/log/heimdall
+
+# install heimdall if necessary
+[[ -f /heimdall/heimdall.tar.gz ]] && \
+ echo "New container detected, installing Heimdall" && \
+ tar xf \
+ 	/heimdall/heimdall.tar.gz -C \
+	/var/www/localhost/heimdall --strip-components=1 && \
+ echo -e '\n# Heimdall user authorization\nfastcgi_param  PHP_AUTH_USER $remote_user;\nfastcgi_param  PHP_AUTH_PW $http_authorization;' >> \
+	/etc/nginx/fastcgi_params && \
+ rm -rf /heimdall && \
+ chown -R abc:abc /var/www/localhost/heimdall
+
+# create symlinks
+
+symlinks=( \
+/var/www/localhost/heimdall/storage/app/public/avatars \
+/var/www/localhost/heimdall/storage/app/public/backgrounds \
+/var/www/localhost/heimdall/storage/app/public/icons \
+/var/www/localhost/heimdall/app/SupportedApps \
+/var/www/localhost/heimdall/database/app.sqlite \
+/var/www/localhost/heimdall/.env )
+
+for i in "${symlinks[@]}"
+do
+[[ -e "$i" && ! -L "$i" ]] && rm -rf "$i"
+[[ ! -L "$i" ]] && ln -s /config/www/"$(basename "$i")" "$i"
+done
+
+[[ -e "/var/www/localhost/heimdall/storage/logs/laravel.log" && ! -L "/var/www/localhost/heimdall/storage/logs/laravel.log" ]] \
+	&& rm -rf "/var/www/localhost/heimdall/storage/logs/laravel.log"
+[[ ! -L "/var/www/localhost/heimdall/storage/logs/laravel.log" ]] && \
+	ln -s "/config/log/heimdall/laravel.log" "/var/www/localhost/heimdall/storage/logs/laravel.log"
+
+# copy .env if not exists
+[[ ! -f /config/www/.env ]] && \
+  cp /var/www/localhost/heimdall/.env.example /config/www/.env && \
+  echo "generating app key"
+  php /var/www/localhost/heimdall/artisan key:generate
+# set queue driver to database
+sed -i 's/QUEUE_DRIVER=sync/QUEUE_DRIVER=database/' /config/www/.env
+
+# permissions
+chown -R abc:abc \
+	/config \
+	/var/www/localhost/heimdall

root/etc/logrotate.d/heimdall

@@ -0,0 +1,9 @@
+/config/log/heimdall/laravel.log {
+        size 5M
+        rotate 5
+        compress
+        nodateext
+        notifempty
+        missingok
+        su abc abc
+}

root/etc/services.d/cloud9/run

@@ -1,6 +0,0 @@
-#!/usr/bin/with-contenv bash
-
-cd /c9sdk
-HOME=/c9bins exec \
-	s6-setuidgid abc \
-	/c9bins/.c9/node/bin/node server.js --listen 0.0.0.0 -p 8000 -w /var/www/localhost/heimdall -a :