Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
docker-baseimage-ubuntu
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
JetBrains YouTrack
External wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Prosper
docker-baseimage-ubuntu
Commits
aab2adc0
Commit
aab2adc0
authored
4 years ago
by
Eric Nemchik
Committed by
Ryan Kuba
4 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Update s6-overlay to v2.1.0.2 with new installer
parent
2092407c
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
Dockerfile
+5
-11
5 additions, 11 deletions
Dockerfile
Dockerfile.aarch64
+5
-11
5 additions, 11 deletions
Dockerfile.aarch64
Dockerfile.armhf
+5
-11
5 additions, 11 deletions
Dockerfile.armhf
with
15 additions
and
33 deletions
Dockerfile
+
5
−
11
View file @
aab2adc0
...
...
@@ -30,9 +30,13 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
LABEL
maintainer="TheLamer"
# set version for s6 overlay
ARG
OVERLAY_VERSION="v2.1.0.
0
"
ARG
OVERLAY_VERSION="v2.1.0.
2
"
ARG
OVERLAY_ARCH="amd64"
# add s6 overlay
ADD
https://github.com/just-containers/s6-overlay/releases/download/${OVERLAY_VERSION}/s6-overlay-${OVERLAY_ARCH}-installer /tmp/
RUN
chmod
+x /tmp/s6-overlay-
${
OVERLAY_ARCH
}
-installer
&&
/tmp/s6-overlay-
${
OVERLAY_ARCH
}
-installer
/
&&
rm
/tmp/s6-overlay-
${
OVERLAY_ARCH
}
-installer
# set environment variables
ARG
DEBIAN_FRONTEND="noninteractive"
ENV
HOME="/root" \
...
...
@@ -88,16 +92,6 @@ RUN \
tzdata
&&
\
echo
"**** generate locale ****"
&&
\
locale-gen en_US.UTF-8
&&
\
echo
"**** add s6 overlay ****"
&&
\
rm
-f
/bin
&&
\
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
/
&&
\
mv
/bin/
*
/usr/bin
&&
\
rm
-Rf
/bin
&&
\
ln
-s
/usr/bin /bin
&&
\
echo
"**** create abc user and make our folders ****"
&&
\
useradd
-u
911
-U
-d
/config
-s
/bin/false abc
&&
\
usermod
-G
users
abc
&&
\
...
...
This diff is collapsed.
Click to expand it.
Dockerfile.aarch64
+
5
−
11
View file @
aab2adc0
...
...
@@ -30,9 +30,13 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
LABEL maintainer="TheLamer"
# set version for s6 overlay
ARG OVERLAY_VERSION="v2.1.0.
0
"
ARG OVERLAY_VERSION="v2.1.0.
2
"
ARG OVERLAY_ARCH="aarch64"
# add s6 overlay
ADD https://github.com/just-containers/s6-overlay/releases/download/${OVERLAY_VERSION}/s6-overlay-${OVERLAY_ARCH}-installer /tmp/
RUN chmod +x /tmp/s6-overlay-${OVERLAY_ARCH}-installer && /tmp/s6-overlay-${OVERLAY_ARCH}-installer / && rm /tmp/s6-overlay-${OVERLAY_ARCH}-installer
# set environment variables
ARG DEBIAN_FRONTEND="noninteractive"
ENV HOME="/root" \
...
...
@@ -88,16 +92,6 @@ RUN \
tzdata && \
echo "**** generate locale ****" && \
locale-gen en_US.UTF-8 && \
echo "**** add s6 overlay ****" && \
rm -f /bin && \
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 / && \
mv /bin/* /usr/bin && \
rm -Rf /bin && \
ln -s /usr/bin /bin && \
echo "**** create abc user and make our folders ****" && \
useradd -u 911 -U -d /config -s /bin/false abc && \
usermod -G users abc && \
...
...
This diff is collapsed.
Click to expand it.
Dockerfile.armhf
+
5
−
11
View file @
aab2adc0
...
...
@@ -30,9 +30,13 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
LABEL maintainer="TheLamer"
# set version for s6 overlay
ARG OVERLAY_VERSION="v2.1.0.
0
"
ARG OVERLAY_VERSION="v2.1.0.
2
"
ARG OVERLAY_ARCH="arm"
# add s6 overlay
ADD https://github.com/just-containers/s6-overlay/releases/download/${OVERLAY_VERSION}/s6-overlay-${OVERLAY_ARCH}-installer /tmp/
RUN chmod +x /tmp/s6-overlay-${OVERLAY_ARCH}-installer && /tmp/s6-overlay-${OVERLAY_ARCH}-installer / && rm /tmp/s6-overlay-${OVERLAY_ARCH}-installer
# set environment variables
ARG DEBIAN_FRONTEND="noninteractive"
ENV HOME="/root" \
...
...
@@ -88,16 +92,6 @@ RUN \
tzdata && \
echo "**** generate locale ****" && \
locale-gen en_US.UTF-8 && \
echo "**** add s6 overlay ****" && \
rm -f /bin && \
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 / && \
mv /bin/* /usr/bin && \
rm -Rf /bin && \
ln -s /usr/bin /bin && \
echo "**** create abc user and make our folders ****" && \
useradd -u 911 -U -d /config -s /bin/false abc && \
usermod -G users abc && \
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment