Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

install docker-compose #1

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

install docker-compose #1

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cef6796
install docker-compose
joliveros Mar 1, 2021
0eaa0b6
use python 3, remove some lines that no longer work
joliveros Mar 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,12 @@ RUN curl -sL https://deb.nodesource.com/setup_12.x | bash - && \
build-essential \
libssl-dev \
libffi-dev \
python-dev \
python3-dev \
&& rm -rf /var/lib/apt/lists/* && \
curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - && \
python3-dev && \
rm -rf /var/lib/apt/lists/*

RUN rm /usr/bin/python && ln -s /usr/bin/python3 /usr/bin/python

RUN curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - && \
add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu xenial stable" && \
apt-get update && \
apt-get install -y docker-ce=17.06.2~ce-0~ubuntu && \
Expand All @@ -36,7 +38,8 @@ RUN curl -sL https://deb.nodesource.com/setup_12.x | bash - && \
python get-pip.py && \
pip install \
elasticsearch-curator==5.4.0 \
boto==2.48.0
boto==2.48.0 \
docker-compose


ARG user=jenkins
Expand Down Expand Up @@ -74,9 +77,6 @@ RUN curl -fsSL https://github.com/krallin/tini/releases/download/v${TINI_VERSION
&& echo "$TINI_SHA /bin/tini" | sha256sum -c -

COPY init.groovy /usr/share/jenkins/ref/init.groovy.d/tcp-slave-agent-port.groovy
COPY ops-tools/jenkins-scripts/ /var/jenkins_home/bin/

RUN chmod -R 755 /var/jenkins_home/bin/

# jenkins version being bundled in this docker image
ARG JENKINS_VERSION
Expand Down Expand Up @@ -138,4 +138,4 @@ ENTRYPOINT ["/bin/tini", "--", "/usr/local/bin/jenkins.sh"]

# from a derived Dockerfile, can use `RUN plugins.sh active.txt` to setup /usr/share/jenkins/ref/plugins from a support bundle
COPY plugins.sh /usr/local/bin/plugins.sh
COPY install-plugins.sh /usr/local/bin/install-plugins.sh
COPY install-plugins.sh /usr/local/bin/install-plugins.sh