Merge pull request #16 from linuxserver/bionic-pipeline

Bionic pipeline

Merge pull request #16 from linuxserver/bionic-pipeline
5b781877 · aptalca · GitHub · 1d301dff · ecc16600 · 5b781877
Unverified Commit 5b781877 authored 6 years ago by aptalca Committed by GitHub 6 years ago
--- a/Dockerfile
+++ b/Dockerfile
-FROM lsiobase/bionic-root-x86
+FROM alpine:3.9 as rootfs-stage
+MAINTAINER sparkyballs,thelamer
+
+# environment
+ENV REL=bionic
+ENV ARCH=amd64
+# install packages
+RUN \
+ apk add --no-cache \
+        bash \
+        curl \
+        tzdata \
+        xz
+
+# grab base tarball
+RUN \
+ mkdir /root-out && \
+ curl -o \
+	/rootfs.tar.gz -L \
+	https://partner-images.canonical.com/core/${REL}/current/ubuntu-${REL}-core-cloudimg-${ARCH}-root.tar.gz && \
+ tar xf \
+        /rootfs.tar.gz -C \
+        /root-out
+
+# Runtime stage
+FROM scratch
+COPY --from=rootfs-stage /root-out/ /
+LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
+LABEL MAINTAINER="sparkyballs,TheLamer"

 # set version for s6 overlay
 ARG OVERLAY_VERSION="v1.22.0.0"
 ARG OVERLAY_ARCH="amd64"

-# set environment variables
+# set environment variables
 ARG DEBIAN_FRONTEND="noninteractive"
 ENV HOME="/root" \
 LANGUAGE="en_US.UTF-8" \
 LANG="en_US.UTF-8" \
 TERM="xterm"

-# copy sources
+# copy sources
 COPY sources.list /etc/apt/

 RUN \
+ echo "**** Ripped from Ubuntu Docker Logic ****" && \
+ set -xe && \
+ echo '#!/bin/sh' \
+	> /usr/sbin/policy-rc.d && \
+ echo 'exit 101' \
+	>> /usr/sbin/policy-rc.d && \
+ chmod +x \
+	/usr/sbin/policy-rc.d && \
+ dpkg-divert --local --rename --add /sbin/initctl && \
+ cp -a \
+	/usr/sbin/policy-rc.d \
+	/sbin/initctl && \
+ sed -i \
+	's/^exit.*/exit 0/' \
+	/sbin/initctl && \
+ echo 'force-unsafe-io' \
+	> /etc/dpkg/dpkg.cfg.d/docker-apt-speedup && \
+ echo 'DPkg::Post-Invoke { "rm -f /var/cache/apt/archives/*.deb /var/cache/apt/archives/partial/*.deb /var/cache/apt/*.bin || true"; };' \
+	> /etc/apt/apt.conf.d/docker-clean && \
+ echo 'APT::Update::Post-Invoke { "rm -f /var/cache/apt/archives/*.deb /var/cache/apt/archives/partial/*.deb /var/cache/apt/*.bin || true"; };' \
+	>> /etc/apt/apt.conf.d/docker-clean && \
+ echo 'Dir::Cache::pkgcache ""; Dir::Cache::srcpkgcache "";' \
+	>> /etc/apt/apt.conf.d/docker-clean && \
+ echo 'Acquire::Languages "none";' \
+	> /etc/apt/apt.conf.d/docker-no-languages && \
+ echo 'Acquire::GzipIndexes "true"; Acquire::CompressionTypes::Order:: "gz";' \
+	> /etc/apt/apt.conf.d/docker-gzip-indexes && \
+ echo 'Apt::AutoRemove::SuggestsImportant "false";' \
+	> /etc/apt/apt.conf.d/docker-autoremove-suggests && \
+ mkdir -p /run/systemd && \
+ echo 'docker' \
+	> /run/systemd/container && \
 echo "**** install apt-utils and locales ****" && \
 apt-get update && \
 apt-get install -y \

--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
+FROM alpine:3.9 as rootfs-stage
+MAINTAINER sparkyballs,thelamer
+
+# environment
+ENV REL=bionic
+ENV ARCH=arm64
+# install packages
+RUN \
+ apk add --no-cache \
+        bash \
+        curl \
+        tzdata \
+        xz
+
+# grab base tarball
+RUN \
+ mkdir /root-out && \
+ curl -o \
+	/rootfs.tar.gz -L \
+	https://partner-images.canonical.com/core/${REL}/current/ubuntu-${REL}-core-cloudimg-${ARCH}-root.tar.gz && \
+ tar xf \
+        /rootfs.tar.gz -C \
+        /root-out
+
+# Runtime stage
+FROM scratch
+COPY --from=rootfs-stage /root-out/ /
+# Add qemu to run on x86_64 systems
+COPY qemu-aarch64-static /usr/bin
+LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
+LABEL MAINTAINER="sparkyballs,TheLamer"
+
+# set version for s6 overlay
+ARG OVERLAY_VERSION="v1.22.0.0"
+ARG OVERLAY_ARCH="aarch64"
+
+# set environment variables
+ARG DEBIAN_FRONTEND="noninteractive"
+ENV HOME="/root" \
+LANGUAGE="en_US.UTF-8" \
+LANG="en_US.UTF-8" \
+TERM="xterm"
+
+# copy sources
+COPY sources.list.arm /etc/apt/
+
+RUN \
+ echo "**** Ripped from Ubuntu Docker Logic ****" && \
+ set -xe && \
+ echo '#!/bin/sh' \
+	> /usr/sbin/policy-rc.d && \
+ echo 'exit 101' \
+	>> /usr/sbin/policy-rc.d && \
+ chmod +x \
+	/usr/sbin/policy-rc.d && \
+ dpkg-divert --local --rename --add /sbin/initctl && \
+ cp -a \
+	/usr/sbin/policy-rc.d \
+	/sbin/initctl && \
+ sed -i \
+	's/^exit.*/exit 0/' \
+	/sbin/initctl && \
+ echo 'force-unsafe-io' \
+	> /etc/dpkg/dpkg.cfg.d/docker-apt-speedup && \
+ echo 'DPkg::Post-Invoke { "rm -f /var/cache/apt/archives/*.deb /var/cache/apt/archives/partial/*.deb /var/cache/apt/*.bin || true"; };' \
+	> /etc/apt/apt.conf.d/docker-clean && \
+ echo 'APT::Update::Post-Invoke { "rm -f /var/cache/apt/archives/*.deb /var/cache/apt/archives/partial/*.deb /var/cache/apt/*.bin || true"; };' \
+	>> /etc/apt/apt.conf.d/docker-clean && \
+ echo 'Dir::Cache::pkgcache ""; Dir::Cache::srcpkgcache "";' \
+	>> /etc/apt/apt.conf.d/docker-clean && \
+ echo 'Acquire::Languages "none";' \
+	> /etc/apt/apt.conf.d/docker-no-languages && \
+ echo 'Acquire::GzipIndexes "true"; Acquire::CompressionTypes::Order:: "gz";' \
+	> /etc/apt/apt.conf.d/docker-gzip-indexes && \
+ echo 'Apt::AutoRemove::SuggestsImportant "false";' \
+	> /etc/apt/apt.conf.d/docker-autoremove-suggests && \
+ mkdir -p /run/systemd && \
+ echo 'docker' \
+	> /run/systemd/container && \
+ echo "**** install apt-utils and locales ****" && \
+ apt-get update && \
+ apt-get install -y \
+	apt-utils \
+	locales && \
+ echo "**** install packages ****" && \
+ apt-get install -y \
+	curl \
+	tzdata && \
+ echo "**** generate locale ****" && \
+ locale-gen en_US.UTF-8 && \
+ echo "**** add s6 overlay ****" && \
+ curl -o \
+ /tmp/s6-overlay.tar.gz -L \
+	"https://github.com/just-containers/s6-overlay/releases/download/${OVERLAY_VERSION}/s6-overlay-${OVERLAY_ARCH}.tar.gz" && \
+ tar xfz \
+	/tmp/s6-overlay.tar.gz -C / && \
+ echo "**** create abc user and make our folders ****" && \
+ useradd -u 911 -U -d /config -s /bin/false abc && \
+ usermod -G users abc && \
+ mkdir -p \
+	/app \
+	/config \
+	/defaults && \
+ echo "**** cleanup ****" && \
+ apt-get clean && \
+ rm -rf \
+	/tmp/* \
+	/var/lib/apt/lists/* \
+	/var/tmp/*
+
+# add local files
+COPY root/ /
+
+ENTRYPOINT ["/init"]
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
+FROM alpine:3.9 as rootfs-stage
+MAINTAINER sparkyballs,thelamer
+
+# environment
+ENV REL=bionic
+ENV ARCH=armhf
+# install packages
+RUN \
+ apk add --no-cache \
+        bash \
+        curl \
+        tzdata \
+        xz
+
+# grab base tarball
+RUN \
+ mkdir /root-out && \
+ curl -o \
+	/rootfs.tar.gz -L \
+	https://partner-images.canonical.com/core/${REL}/current/ubuntu-${REL}-core-cloudimg-${ARCH}-root.tar.gz && \
+ tar xf \
+        /rootfs.tar.gz -C \
+        /root-out
+
+# Runtime stage
+FROM scratch
+COPY --from=rootfs-stage /root-out/ /
+# Add qemu to build on x86_64 systems
+COPY qemu-arm-static /usr/bin
+LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
+LABEL MAINTAINER="sparkyballs,TheLamer"
+
+# set version for s6 overlay
+ARG OVERLAY_VERSION="v1.22.0.0"
+ARG OVERLAY_ARCH="arm"
+
+# set environment variables
+ARG DEBIAN_FRONTEND="noninteractive"
+ENV HOME="/root" \
+LANGUAGE="en_US.UTF-8" \
+LANG="en_US.UTF-8" \
+TERM="xterm"
+
+# copy sources
+COPY sources.list.arm /etc/apt/
+
+RUN \
+ echo "**** Ripped from Ubuntu Docker Logic ****" && \
+ set -xe && \
+ echo '#!/bin/sh' \
+	> /usr/sbin/policy-rc.d && \
+ echo 'exit 101' \
+	>> /usr/sbin/policy-rc.d && \
+ chmod +x \
+	/usr/sbin/policy-rc.d && \
+ dpkg-divert --local --rename --add /sbin/initctl && \
+ cp -a \
+	/usr/sbin/policy-rc.d \
+	/sbin/initctl && \
+ sed -i \
+	's/^exit.*/exit 0/' \
+	/sbin/initctl && \
+ echo 'force-unsafe-io' \
+	> /etc/dpkg/dpkg.cfg.d/docker-apt-speedup && \
+ echo 'DPkg::Post-Invoke { "rm -f /var/cache/apt/archives/*.deb /var/cache/apt/archives/partial/*.deb /var/cache/apt/*.bin || true"; };' \
+	> /etc/apt/apt.conf.d/docker-clean && \
+ echo 'APT::Update::Post-Invoke { "rm -f /var/cache/apt/archives/*.deb /var/cache/apt/archives/partial/*.deb /var/cache/apt/*.bin || true"; };' \
+	>> /etc/apt/apt.conf.d/docker-clean && \
+ echo 'Dir::Cache::pkgcache ""; Dir::Cache::srcpkgcache "";' \
+	>> /etc/apt/apt.conf.d/docker-clean && \
+ echo 'Acquire::Languages "none";' \
+	> /etc/apt/apt.conf.d/docker-no-languages && \
+ echo 'Acquire::GzipIndexes "true"; Acquire::CompressionTypes::Order:: "gz";' \
+	> /etc/apt/apt.conf.d/docker-gzip-indexes && \
+ echo 'Apt::AutoRemove::SuggestsImportant "false";' \
+	> /etc/apt/apt.conf.d/docker-autoremove-suggests && \
+ mkdir -p /run/systemd && \
+ echo 'docker' \
+	> /run/systemd/container && \
+ echo "**** install apt-utils and locales ****" && \
+ apt-get update && \
+ apt-get install -y \
+	apt-utils \
+	locales && \
+ echo "**** install packages ****" && \
+ apt-get install -y \
+	curl \
+	tzdata && \
+ echo "**** generate locale ****" && \
+ locale-gen en_US.UTF-8 && \
+ echo "**** add s6 overlay ****" && \
+ curl -o \
+ /tmp/s6-overlay.tar.gz -L \
+	"https://github.com/just-containers/s6-overlay/releases/download/${OVERLAY_VERSION}/s6-overlay-${OVERLAY_ARCH}.tar.gz" && \
+ tar xfz \
+	/tmp/s6-overlay.tar.gz -C / && \
+ echo "**** create abc user and make our folders ****" && \
+ useradd -u 911 -U -d /config -s /bin/false abc && \
+ usermod -G users abc && \
+ mkdir -p \
+	/app \
+	/config \
+	/defaults && \
+ echo "**** cleanup ****" && \
+ apt-get clean && \
+ rm -rf \
+	/tmp/* \
+	/var/lib/apt/lists/* \
+	/var/tmp/*
+
+# add local files
+COPY root/ /
+
+ENTRYPOINT ["/init"]
--- a/Jenkinsfile
+++ b/Jenkinsfile
--- a/README.md
+++ b/README.md
 [linuxserverurl]: https://linuxserver.io
 [forumurl]: https://forum.linuxserver.io
 [ircurl]: https://www.linuxserver.io/irc/
-[podcasturl]: https://www.linuxserver.io/podcast/
+[appurl]: https://cloud-images.ubuntu.com
+[dockerfileurl]: https://github.com/linuxserver/docker-baseimage-ubuntu/blob/master/Dockerfile

-[![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl]

-[Dockerfile](https://github.com/linuxserver/docker-baseimage-xenial/blob/master/Dockerfile)

-[![](https://images.microbadger.com/badges/image/lsiobase/xenial.svg)](https://microbadger.com/images/lsiobase/xenial "Get your own image badge on microbadger.com")
+[![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png?v=4&s=4000)][linuxserverurl]

-### This base container is not aimed at public consumption. It exists to serve as a single endpoint for LinuxServer.io containers and is based upon [Ubuntu Xenial](https://hub.docker.com/_/ubuntu/) and [S6 overlay](https://github.com/just-containers/s6-overlay)..

-If you want to comment\contribute to this image, are looking for support on any of our other work , or are curious about us in general, check out the following.
+## Contact information:-

-* [forum.linuxserver.io][forumurl]
-* [IRC][ircurl] on freenode at `#linuxserver.io`
-* [Podcast][podcasturl] covers everything to do with getting the most from your Linux Server plus a focus on all things Docker and containerisation!
+| Type | Address/Details |
+| :---: | --- |
+| Discord | [Discord](https://discord.gg/YWrKVTn) |
+| IRC | freenode at `#linuxserver.io` more information at:- [IRC][ircurl]
+| Forum | [Linuserver.io forum][forumurl] |
+
+&nbsp;
+&nbsp;
+
+[![](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/Dockerfile-Xenial-green.png)](https://github.com/linuxserver/docker-baseimage-ubuntu/blob/xenial/Dockerfile)
+
+[![](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/Dockerfile-Bionic-green.png)](https://github.com/linuxserver/docker-baseimage-ubuntu/blob/bionic/Dockerfile)
+
+[![](https://images.microbadger.com/badges/image/lsiobase/ubuntu.svg)](https://microbadger.com/images/lsiobase/ubuntu "Get your own image badge on microbadger.com")
+
+A custom base image built with [Ubuntu cloud image][appurl] and [S6 overlay](https://github.com/just-containers/s6-overlay)..
+
+The following line is only in this repo for loop testing:
+
+- { date: "01.01.50:", desc: "I am the release message for this internal repo." }
--- a/jenkins-vars.yml
+++ b/jenkins-vars.yml
+---
+
+# jenkins variables
+project_name: docker-baseimage-ubuntu
+external_type: os
+release_type: stable
+release_tag: bionic
+ls_branch: bionic
+repo_vars:
+  - BUILD_VERSION_ARG = 'OS'
+  - LS_USER = 'linuxserver'
+  - LS_REPO = 'docker-baseimage-ubuntu'
+  - CONTAINER_NAME = 'baseimage-ubuntu'
+  - DOCKERHUB_IMAGE = 'lsiobase/ubuntu'
+  - DEV_DOCKERHUB_IMAGE = 'lsiodev/ubuntu'
+  - PR_DOCKERHUB_IMAGE = 'lspipepr/ubuntu'
+  - DIST_IMAGE = 'ubuntu'
+  - MULTIARCH='true'
+  - CI='true'
+  - CI_WEB='false'
+  - CI_PORT='80'
+  - CI_SSL='true'
+  - CI_DELAY='30'
+  - CI_DOCKERENV='TZ=US/Pacific'
+  - CI_AUTH='user:password'
+  - CI_WEBPATH=''
--- a/readme-vars.yml
+++ b/readme-vars.yml
+---
+
+# project information
+project_name: base-ubuntu-example
+full_custom_readme: |
+  {% raw -%}
+  [linuxserverurl]: https://linuxserver.io
+  [forumurl]: https://forum.linuxserver.io
+  [ircurl]: https://www.linuxserver.io/irc/
+  [appurl]: https://cloud-images.ubuntu.com
+  [dockerfileurl]: https://github.com/linuxserver/docker-baseimage-ubuntu/blob/master/Dockerfile
+
+
+
+  [![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png?v=4&s=4000)][linuxserverurl]
+
+
+  ## Contact information:-
+
+  | Type | Address/Details |
+  | :---: | --- |
+  | Discord | [Discord](https://discord.gg/YWrKVTn) |
+  | IRC | freenode at `#linuxserver.io` more information at:- [IRC][ircurl]
+  | Forum | [Linuserver.io forum][forumurl] |
+
+  &nbsp;
+  &nbsp;
+
+  [![](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/Dockerfile-Xenial-green.png)](https://github.com/linuxserver/docker-baseimage-ubuntu/blob/xenial/Dockerfile)
+
+  [![](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/Dockerfile-Bionic-green.png)](https://github.com/linuxserver/docker-baseimage-ubuntu/blob/bionic/Dockerfile)
+
+  [![](https://images.microbadger.com/badges/image/lsiobase/ubuntu.svg)](https://microbadger.com/images/lsiobase/ubuntu "Get your own image badge on microbadger.com")
+
+  A custom base image built with [Ubuntu cloud image][appurl] and [S6 overlay](https://github.com/just-containers/s6-overlay)..
+
+  The following line is only in this repo for loop testing:
+
+  - { date: "01.01.50:", desc: "I am the release message for this internal repo." }
+  {%- endraw %}
--- a/sources.list
+++ b/sources.list
-# See http://help.ubuntu.com/community/UpgradeNotes for how to upgrade to
-# newer versions of the distribution.
-
 deb http://archive.ubuntu.com/ubuntu/ bionic main restricted
 deb-src http://archive.ubuntu.com/ubuntu/ bionic main restricted
-
-## Major bug fix updates produced after the final release of the
-## distribution.
 deb http://archive.ubuntu.com/ubuntu/ bionic-updates main restricted
 deb-src http://archive.ubuntu.com/ubuntu/ bionic-updates main restricted
-
-## Uncomment the following two lines to add software from the 'universe'
-## repository.
-## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu
-## team. Also, please note that software in universe WILL NOT receive any
-## review or updates from the Ubuntu security team.
 deb http://archive.ubuntu.com/ubuntu/ bionic universe multiverse
 deb-src http://archive.ubuntu.com/ubuntu/ bionic universe multiverse
 deb http://archive.ubuntu.com/ubuntu/ bionic-updates universe multiverse
 deb-src http://archive.ubuntu.com/ubuntu/ bionic-updates universe multiverse
-
-## N.B. software from this repository may not have been tested as
-## extensively as that contained in the main release, although it includes
-## newer versions of some applications which may provide useful features.
-## Also, please note that software in backports WILL NOT receive any review
-## or updates from the Ubuntu security team.
-# deb http://archive.ubuntu.com/ubuntu/ bionic-backports main restricted
-# deb-src http://archive.ubuntu.com/ubuntu/ bionic-backports main restricted
-
 deb http://archive.ubuntu.com/ubuntu/ bionic-security main restricted
 deb-src http://archive.ubuntu.com/ubuntu/ bionic-security main restricted
 deb http://archive.ubuntu.com/ubuntu/ bionic-security universe multiverse

--- a/sources.list.arm
+++ b/sources.list.arm
+deb http://ports.ubuntu.com/ubuntu-ports/ bionic main restricted multiverse
+deb-src http://ports.ubuntu.com/ubuntu-ports/ bionic main restricted multiverse
+deb http://ports.ubuntu.com/ubuntu-ports/ bionic-updates main restricted multiverse
+deb-src http://ports.ubuntu.com/ubuntu-ports/ bionic-updates main restricted multiverse
+deb http://ports.ubuntu.com/ubuntu-ports/ bionic universe
+deb-src http://ports.ubuntu.com/ubuntu-ports/ bionic universe
+deb http://ports.ubuntu.com/ubuntu-ports/ bionic-updates universe
+deb-src http://ports.ubuntu.com/ubuntu-ports/ bionic-updates universe
+deb http://ports.ubuntu.com/ubuntu-ports/ bionic-security main restricted multiverse
+deb-src http://ports.ubuntu.com/ubuntu-ports/ bionic-security main restricted multiverse
+deb http://ports.ubuntu.com/ubuntu-ports/ bionic-security universe
+deb-src http://ports.ubuntu.com/ubuntu-ports/ bionic-security universe