Skip to content

Commit ab1585b

Browse files
committed
revert dockerfile and jenkinsfile changes
Signed-off-by: Andrew Twydell <[email protected]>
1 parent 831f6db commit ab1585b

File tree

2 files changed

+7
-53
lines changed

2 files changed

+7
-53
lines changed

Dockerfile

Lines changed: 7 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,12 @@
33
# Docker Image for Testing Environment #
44
# ---------------------------------------------------------------------------- #
55
FROM python:3.8-buster
6-
7-
SHELL [ "/bin/bash", "-c" ]
8-
96
RUN apt-get update && apt-get install -y gnupg2 git python-pip python3-pip openssh-client && python2.7 -m pip install virtualenv==20.4.7
10-
11-
RUN python3 -m venv /venv3
12-
RUN python2.7 -m virtualenv /venv2
13-
RUN source /venv3/bin/activate
14-
15-
COPY ./requirements.txt /ibm_zos_cics/ansible_collections/ibm/ibm_zos_cics/
16-
COPY ./dev-requirements.txt /ibm_zos_cics/ansible_collections/ibm/ibm_zos_cics/
17-
18-
RUN pip install -r /ibm_zos_cics/ansible_collections/ibm/ibm_zos_cics/dev-requirements.txt
19-
20-
COPY ./ /ibm_zos_cics/ansible_collections/ibm/ibm_zos_cics
21-
WORKDIR /ibm_zos_cics/ansible_collections/ibm/ibm_zos_cics
22-
237
# -------------------- Map UID and GID to Jenkins host IDs ------------------- #
24-
# ARG UNAME=jenkins
25-
# ARG UID=114
26-
# ARG GID=121
27-
# RUN groupadd -g $GID -o $UNAME
28-
# RUN useradd -m -u $UID -g $GID -o -s /bin/bash $UNAME
29-
# USER ${UNAME}
30-
# ENV PATH="/home/jenkins/.local/bin:${PATH}"
8+
ARG UNAME=jenkins
9+
ARG UID=114
10+
ARG GID=121
11+
RUN groupadd -g $GID -o $UNAME
12+
RUN useradd -m -u $UID -g $GID -o -s /bin/bash $UNAME
13+
USER ${UNAME}
14+
ENV PATH="/home/jenkins/.local/bin:${PATH}"

jenkinsfile

Lines changed: 0 additions & 30 deletions
This file was deleted.

0 commit comments

Comments
 (0)