modify development branch to include an IDE and be self contained

persist laravel.log

Dockerfile

@@ -1,4 +1,5 @@
-FROM lsiobase/nginx:3.9
+FROM lsiobase/cloud9:files-alpine as c9files
+FROM lsiobase/nginx:3.10
 
 # set version label
 ARG BUILD_DATE
@@ -10,7 +11,30 @@ 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 \
@@ -21,20 +45,27 @@ RUN \
 	tar && \
  echo "**** install heimdall ****" && \
  mkdir -p \
+	/c9sdk/build/standalone \
+	/var/www/localhost/heimdall && \
+ git clone \
+	https://github.com/linuxserver/Heimdall.git \
+	/var/www/localhost/heimdall && \
+ echo "**** dev setup and permissions ****" && \
+ echo -e \
+	'\n# Heimdall user authorization\nfastcgi_param  PHP_AUTH_USER $remote_user;\nfastcgi_param  PHP_AUTH_PW $http_authorization;' >> \
+        /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 && \
- if [ -z ${HEIMDALL_RELEASE+x} ]; then \
- 	HEIMDALL_RELEASE=$(curl -sX GET "https://api.github.com/repos/linuxserver/Heimdall/commits/master" \
-	| awk '/sha/{print $4;exit}' FS='[""]'); \
- fi && \
- curl -o \
- /tmp/heimdall.tar.gz -L \
-	"https://github.com/linuxserver/Heimdall/archive/${HEIMDALL_RELEASE}.tar.gz" && \
- tar xf \
- /tmp/heimdall.tar.gz -C \
-	/var/www/localhost/heimdall --strip-components=1 && \
- echo "**** configure nginx ****" && \
- echo -e '\n# Heimdall user authorization\nfastcgi_param  PHP_AUTH_USER $remote_user;\nfastcgi_param  PHP_AUTH_PW $http_authorization;' >> \
-	/etc/nginx/fastcgi_params && \
  echo "**** cleanup ****" && \
  rm -rf \
 	/tmp/*

Dockerfile.aarch64

@@ -1,4 +1,5 @@
-FROM lsiobase/nginx:arm64v8-3.9
+FROM lsiobase/cloud9:arm64v8-files-alpine as c9files
+FROM lsiobase/nginx:arm64v8-3.10
 
 # set version label
 ARG BUILD_DATE
@@ -10,7 +11,30 @@ 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 \
@@ -21,20 +45,27 @@ RUN \
 	tar && \
  echo "**** install heimdall ****" && \
  mkdir -p \
+	/c9sdk/build/standalone \
 	/var/www/localhost/heimdall && \
- if [ -z ${HEIMDALL_RELEASE+x} ]; then \
- 	HEIMDALL_RELEASE=$(curl -sX GET "https://api.github.com/repos/linuxserver/Heimdall/commits/master" \
-        | awk '/sha/{print $4;exit}' FS='[""]'); \
- fi && \
- curl -o \
- /tmp/heimdall.tar.gz -L \
-	"https://github.com/linuxserver/Heimdall/archive/${HEIMDALL_RELEASE}.tar.gz" && \
- tar xf \
- /tmp/heimdall.tar.gz -C \
-	/var/www/localhost/heimdall --strip-components=1 && \
- echo "**** configure nginx ****" && \
- echo -e '\n# Heimdall user authorization\nfastcgi_param  PHP_AUTH_USER $remote_user;\nfastcgi_param  PHP_AUTH_PW $http_authorization;' >> \
+ git clone \
+	https://github.com/linuxserver/Heimdall.git \
+	/var/www/localhost/heimdall && \
+ echo "**** dev setup and permissions ****" && \
+ echo -e \
+	'\n# Heimdall user authorization\nfastcgi_param  PHP_AUTH_USER $remote_user;\nfastcgi_param  PHP_AUTH_PW $http_authorization;' >> \
         /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,5 @@
-FROM lsiobase/nginx:arm32v7-3.9
+FROM lsiobase/cloud9:arm32v7-files-alpine as c9files
+FROM lsiobase/nginx:arm32v7-3.10
 
 # set version label
 ARG BUILD_DATE
@@ -10,7 +11,30 @@ 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 \
@@ -21,20 +45,27 @@ RUN \
 	tar && \
  echo "**** install heimdall ****" && \
  mkdir -p \
+	/c9sdk/build/standalone \
 	/var/www/localhost/heimdall && \
- if [ -z ${HEIMDALL_RELEASE+x} ]; then \
- 	HEIMDALL_RELEASE=$(curl -sX GET "https://api.github.com/repos/linuxserver/Heimdall/commits/master" \
-        | awk '/sha/{print $4;exit}' FS='[""]'); \
- fi && \
- curl -o \
- /tmp/heimdall.tar.gz -L \
-	"https://github.com/linuxserver/Heimdall/archive/${HEIMDALL_RELEASE}.tar.gz" && \
- tar xf \
- /tmp/heimdall.tar.gz -C \
-	/var/www/localhost/heimdall --strip-components=1 && \
- echo "**** configure nginx ****" && \
- echo -e '\n# Heimdall user authorization\nfastcgi_param  PHP_AUTH_USER $remote_user;\nfastcgi_param  PHP_AUTH_PW $http_authorization;' >> \
+ git clone \
+	https://github.com/linuxserver/Heimdall.git \
+	/var/www/localhost/heimdall && \
+ echo "**** dev setup and permissions ****" && \
+ echo -e \
+	'\n# Heimdall user authorization\nfastcgi_param  PHP_AUTH_USER $remote_user;\nfastcgi_param  PHP_AUTH_PW $http_authorization;' >> \
         /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

@@ -168,6 +168,9 @@ Below are the instructions for updating containers:
   containrrr/watchtower \
   --run-once heimdall
   ```
+
+**Note:** We do not endorse the use of Watchtower as a solution to automated updates of existing Docker containers. In fact we generally discourage automated updates. However, this is a useful tool for one-time manual updates of containers where you have forgotten the original parameters. In the long term, we highly recommend using Docker Compose.
+
 * You can also remove the old dangling images: `docker image prune`
 
 ## Building locally
@@ -191,6 +194,9 @@ 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.
 * **22.02.19:** - Rebasing to alpine 3.9.
 * **04.11.18:** - Add php7-zip.

package_versions.txt

@@ -1,67 +1,66 @@
-alpine-baselayout-3.1.0-r3
-alpine-keys-2.1-r1
+alpine-baselayout-3.1.2-r0
+alpine-keys-2.1-r2
 apache2-utils-2.4.39-r0
-apk-tools-2.10.3-r1
+apk-tools-2.10.4-r1
 apr-1.6.5-r0
-apr-util-1.6.1-r5
-bash-4.4.19-r1
-busybox-1.29.3-r10
+apr-util-1.6.1-r6
+bash-5.0.0-r0
+busybox-1.30.1-r2
 ca-certificates-20190108-r0
 ca-certificates-cacert-20190108-r0
-coreutils-8.30-r0
-curl-7.64.0-r2
+coreutils-8.31-r0
+curl-7.65.1-r0
 expat-2.2.6-r0
-git-2.20.1-r0
-libacl-2.2.52-r5
-libattr-2.4.47-r7
+git-2.22.0-r0
+libacl-2.2.52-r6
+libattr-2.4.48-r0
 libc-utils-0.7.1-r0
-libcrypto1.1-1.1.1b-r1
-libcurl-7.64.0-r2
-libedit-20181209.3.1-r0
-libmagic-5.36-r0
+libcrypto1.1-1.1.1c-r0
+libcurl-7.65.1-r0
+libedit-20190324.3.1-r0
+libmagic-5.37-r0
 libressl2.7-libcrypto-2.7.5-r0
 libressl2.7-libssl-2.7.5-r0
-libssh2-1.8.2-r0
-libssl1.1-1.1.1b-r1
-libtls-standalone-2.7.4-r6
-libuuid-2.33-r0
-libxml2-2.9.9-r1
-libzip-1.5.1-r2
-linux-pam-1.3.0-r0
+libssl1.1-1.1.1c-r0
+libtls-standalone-2.9.1-r0
+libuuid-2.33.2-r0
+libxml2-2.9.9-r2
+libzip-1.5.2-r0
+linux-pam-1.3.0-r1
 logrotate-3.15.0-r0
-musl-1.1.20-r4
-musl-utils-1.1.20-r4
-nano-3.2-r0
-ncurses-libs-6.1_p20190105-r0
-ncurses-terminfo-6.1_p20190105-r0
-ncurses-terminfo-base-6.1_p20190105-r0
-nghttp2-libs-1.35.1-r0
-nginx-1.14.2-r1
-openssl-1.1.1b-r1
-pcre-8.42-r1
-pcre2-10.32-r1
-php7-7.2.18-r0
-php7-common-7.2.18-r0
-php7-ctype-7.2.18-r0
-php7-fileinfo-7.2.18-r0
-php7-fpm-7.2.18-r0
-php7-json-7.2.18-r0
-php7-mbstring-7.2.18-r0
-php7-openssl-7.2.18-r0
-php7-pdo-7.2.18-r0
-php7-pdo_sqlite-7.2.18-r0
-php7-session-7.2.18-r0
-php7-simplexml-7.2.18-r0
-php7-tokenizer-7.2.18-r0
-php7-xml-7.2.18-r0
-php7-xmlwriter-7.2.18-r0
-php7-zip-7.2.18-r0
+musl-1.1.22-r2
+musl-utils-1.1.22-r2
+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
+openssl-1.1.1c-r0
+pcre-8.43-r0
+pcre2-10.33-r0
+php7-7.3.6-r0
+php7-common-7.3.6-r0
+php7-ctype-7.3.7-r0
+php7-fileinfo-7.3.6-r0
+php7-fpm-7.3.6-r0
+php7-json-7.3.6-r0
+php7-mbstring-7.3.6-r0
+php7-openssl-7.3.6-r0
+php7-pdo-7.3.7-r0
+php7-pdo_sqlite-7.3.7-r0
+php7-session-7.3.6-r0
+php7-simplexml-7.3.6-r0
+php7-tokenizer-7.3.7-r0
+php7-xml-7.3.6-r0
+php7-xmlwriter-7.3.6-r0
+php7-zip-7.3.7-r0
 popt-1.16-r7
-readline-7.0.003-r1
+readline-8.0.0-r0
 scanelf-1.2.3-r0
-shadow-4.5-r2
+shadow-4.6-r2
 sqlite-libs-3.28.0-r0
-ssl_client-1.29.3-r10
+ssl_client-1.30.1-r2
 tar-1.32-r0
 tzdata-2019a-r0
 xz-5.2.4-r0

readme-vars.yml

@@ -52,6 +52,9 @@ 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." }
   - { date: "22.02.19:", desc: "Rebasing to alpine 3.9." }
   - { date: "04.11.18:", desc: "Add php7-zip." }

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

@@ -1,33 +0,0 @@
-#!/usr/bin/with-contenv bash
-
-# make our folders
-mkdir -p \
-	/config/www/{backgrounds,icons,avatars,SupportedApps}
-
-# 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
-
-# copy .env if not exists
-[[ ! -f /config/www/.env ]] && \
-  cp /var/www/localhost/heimdall/.env.example /config/www/.env && \
-  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/services.d/cloud9/run

@@ -0,0 +1,6 @@
+#!/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 :