Skip to content

Commit

Permalink
Fix/arm image (#66)
Browse files Browse the repository at this point in the history
* dos2unix  / change to bash

* check fs

* change permissions

* check permissions

* check permissions

* wrong binary for arm

* fixed for ubuntu
  • Loading branch information
WolverMinion authored Jan 24, 2021
1 parent b5eed31 commit 20d8563
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 10 deletions.
6 changes: 4 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@ ARG JENKINS_CONFIG_REPO="https://github.com/Continuous-X/jenkins-cx-config-demo-
ARG JENKINS_CONFIG_CASC="master/jenkins.yaml"
ARG INFLUXDB_HOSTNAME="localhost"
ARG INFLUXDB_PORT="8086"
ARG TINI_BIN="tini"
ARG TINI_VERSION="v0.19.0"
ARG TINI_SHA=93dcc18adc78c65a028a84799ecf8ad40c936fdfc5f2a57b1acda5a8117fa82c
ARG JENKINS_VERSION="2.276"
ARG JENKINS_SHA=d3892390eda022bbee648f226d5b9b2806a11016d0bdf691200855361fe185a0
ARG PLUGIN_INSTALLATION_MANAGER_TOOL_VERSION="2.5.0"
Expand Down Expand Up @@ -65,8 +67,8 @@ COPY init_scripts/src/main/groovy/ ${REF}/init.groovy.d/
COPY master/jenkins-cx.sh /usr/local/bin/jenkins-cx.sh
ADD ${JENKINS_CONFIG_CASC} ${CASC_JENKINS_CONFIG}

RUN /install/apt-get.sh \
&& /install/tini.sh tini \
RUN chmod 744 /install/*.sh && ls -la /install && /install/apt-get.sh \
&& /install/tini.sh \
&& /install/jenkins.sh

VOLUME ${JENKINS_HOME}
Expand Down
9 changes: 6 additions & 3 deletions Dockerfile-arm.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@ ARG JENKINS_CONFIG_REPO="https://github.com/Continuous-X/jenkins-cx-config-demo-
ARG JENKINS_CONFIG_CASC="master/jenkins.yaml"
ARG INFLUXDB_HOSTNAME="localhost"
ARG INFLUXDB_PORT="8086"
ARG TINI_BIN="tini-armhf"
ARG TINI_VERSION="v0.19.0"
ARG TINI_SHA=5a9b35f09ad2fb5d08f11ceb84407803a1deff96cbdc0d1222f9f8323f3f8ad4
ARG JENKINS_VERSION="2.276"
ARG JENKINS_SHA=d3892390eda022bbee648f226d5b9b2806a11016d0bdf691200855361fe185a0
ARG PLUGIN_INSTALLATION_MANAGER_TOOL_VERSION="2.5.0"
Expand Down Expand Up @@ -65,9 +67,10 @@ COPY init_scripts/src/main/groovy/ ${REF}/init.groovy.d/
COPY master/jenkins-cx.sh /usr/local/bin/jenkins-cx.sh
ADD ${JENKINS_CONFIG_CASC} ${CASC_JENKINS_CONFIG}

RUN /install/apt-get.sh \
&& /install/tini.sh tini \
&& /install/jenkins.sh
RUN chmod 744 /install/*.sh && ls -la /install && /install/apt-get.sh \
&& /install/tini.sh \
&& /install/jenkins.sh \
&& ls -l /usr/local/bin/jenkins-cx.sh

VOLUME ${JENKINS_HOME}

Expand Down
4 changes: 3 additions & 1 deletion Dockerfile-x86_64-ubuntu-slim.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@ ARG JENKINS_CONFIG_REPO="https://github.com/Continuous-X/jenkins-cx-config-demo-
ARG JENKINS_CONFIG_CASC="master/jenkins.yaml"
ARG INFLUXDB_HOSTNAME="localhost"
ARG INFLUXDB_PORT="8086"
ARG TINI_BIN="tini"
ARG TINI_VERSION="v0.19.0"
ARG TINI_SHA=93dcc18adc78c65a028a84799ecf8ad40c936fdfc5f2a57b1acda5a8117fa82c
ARG JENKINS_VERSION="2.276"
ARG JENKINS_SHA=d3892390eda022bbee648f226d5b9b2806a11016d0bdf691200855361fe185a0
ARG PLUGIN_INSTALLATION_MANAGER_TOOL_VERSION="2.5.0"
Expand Down Expand Up @@ -66,7 +68,7 @@ COPY master/jenkins-cx.sh /usr/local/bin/jenkins-cx.sh
ADD ${JENKINS_CONFIG_CASC} ${CASC_JENKINS_CONFIG}

RUN /install/apt-get.sh \
&& /install/tini.sh tini \
&& /install/tini.sh \
&& /install/jenkins.sh

VOLUME ${JENKINS_HOME}
Expand Down
2 changes: 1 addition & 1 deletion master/install/apt-get.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! /bin/sh
#! /bin/bash

echo "
>> update operating system
Expand Down
5 changes: 2 additions & 3 deletions master/install/tini.sh
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
#! /bin/bash

TINI_BIN_DEFAULT='tini'
TINI_BIN=${1:-${TINI_BIN_DEFAULT}}

echo "
>> download tini files for install
"
curl -fsSL "https://raw.githubusercontent.com/jenkinsci/docker/master/tini_pub.gpg" -o "${JENKINS_HOME}/tini_pub.gpg"
curl -fsSL "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/${TINI_BIN}" -o /sbin/tini
curl -fsSL "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/${TINI_BIN}.asc" -o /sbin/tini.asc
echo "${TINI_SHA} /sbin/tini" | sha256sum -c -

echo "
>> install tini
Expand All @@ -17,6 +15,7 @@ gpg --no-tty --import "${JENKINS_HOME}/tini_pub.gpg"
gpg --verify /sbin/tini.asc
rm -rf /sbin/tini.asc /root/.gnupg
chmod 755 /sbin/tini
/sbin/tini --version

echo "
>> download tini from jenkinsci
Expand Down

0 comments on commit 20d8563

Please sign in to comment.