Skip to content
Snippets Groups Projects
Commit cc670dc5 authored by thelamer's avatar thelamer
Browse files

need to move stuff around to extract s6 properly

parent 658f9ec4
No related branches found
No related tags found
No related merge requests found
...@@ -89,11 +89,15 @@ RUN \ ...@@ -89,11 +89,15 @@ RUN \
echo "**** generate locale ****" && \ echo "**** generate locale ****" && \
locale-gen en_US.UTF-8 && \ locale-gen en_US.UTF-8 && \
echo "**** add s6 overlay ****" && \ echo "**** add s6 overlay ****" && \
rm -f /bin && \
curl -o \ curl -o \
/tmp/s6-overlay.tar.gz -L \ /tmp/s6-overlay.tar.gz -L \
"https://github.com/just-containers/s6-overlay/releases/download/${OVERLAY_VERSION}/s6-overlay-${OVERLAY_ARCH}.tar.gz" && \ "https://github.com/just-containers/s6-overlay/releases/download/${OVERLAY_VERSION}/s6-overlay-${OVERLAY_ARCH}.tar.gz" && \
tar xfz \ tar xfz \
/tmp/s6-overlay.tar.gz -C / && \ /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 ****" && \ echo "**** create abc user and make our folders ****" && \
useradd -u 911 -U -d /config -s /bin/false abc && \ useradd -u 911 -U -d /config -s /bin/false abc && \
usermod -G users abc && \ usermod -G users abc && \
......
...@@ -89,11 +89,15 @@ RUN \ ...@@ -89,11 +89,15 @@ RUN \
echo "**** generate locale ****" && \ echo "**** generate locale ****" && \
locale-gen en_US.UTF-8 && \ locale-gen en_US.UTF-8 && \
echo "**** add s6 overlay ****" && \ echo "**** add s6 overlay ****" && \
rm -f /bin && \
curl -o \ curl -o \
/tmp/s6-overlay.tar.gz -L \ /tmp/s6-overlay.tar.gz -L \
"https://github.com/just-containers/s6-overlay/releases/download/${OVERLAY_VERSION}/s6-overlay-${OVERLAY_ARCH}.tar.gz" && \ "https://github.com/just-containers/s6-overlay/releases/download/${OVERLAY_VERSION}/s6-overlay-${OVERLAY_ARCH}.tar.gz" && \
tar xfz \ tar xfz \
/tmp/s6-overlay.tar.gz -C / && \ /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 ****" && \ echo "**** create abc user and make our folders ****" && \
useradd -u 911 -U -d /config -s /bin/false abc && \ useradd -u 911 -U -d /config -s /bin/false abc && \
usermod -G users abc && \ usermod -G users abc && \
......
...@@ -89,11 +89,15 @@ RUN \ ...@@ -89,11 +89,15 @@ RUN \
echo "**** generate locale ****" && \ echo "**** generate locale ****" && \
locale-gen en_US.UTF-8 && \ locale-gen en_US.UTF-8 && \
echo "**** add s6 overlay ****" && \ echo "**** add s6 overlay ****" && \
rm -f /bin && \
curl -o \ curl -o \
/tmp/s6-overlay.tar.gz -L \ /tmp/s6-overlay.tar.gz -L \
"https://github.com/just-containers/s6-overlay/releases/download/${OVERLAY_VERSION}/s6-overlay-${OVERLAY_ARCH}.tar.gz" && \ "https://github.com/just-containers/s6-overlay/releases/download/${OVERLAY_VERSION}/s6-overlay-${OVERLAY_ARCH}.tar.gz" && \
tar xfz \ tar xfz \
/tmp/s6-overlay.tar.gz -C / && \ /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 ****" && \ echo "**** create abc user and make our folders ****" && \
useradd -u 911 -U -d /config -s /bin/false abc && \ useradd -u 911 -U -d /config -s /bin/false abc && \
usermod -G users abc && \ usermod -G users abc && \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment