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.

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

[ART-8304] Clone art-tools into working directory and clean up post-install #163

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 5 additions & 3 deletions container/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,11 @@ RUN groupadd --gid "$USER_GID" "$USERNAME" \
WORKDIR /workspaces/art-bot

# Clone art-tools and run install.sh script
RUN git clone https://github.com/openshift-eng/art-tools.git art-tools \
&& cd art-tools \
&& ./install.sh
RUN git clone https://github.com/openshift-eng/art-tools.git \
&& cd art-tools \
&& ./install.sh \
&& cd .. \
&& rm -rf art-tools

# Install dependencies from requirements.txt
COPY requirements.txt ./
Expand Down
10 changes: 6 additions & 4 deletions container/Dockerfile.dev
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,14 @@ ARG USERNAME=dev
ARG USER_UID=1000
ARG USER_GID=$USER_UID

# Looks like we need a USER 0 here
# Switch to root user for git operations
USER 0
# Clone art-tools and run install.sh script
RUN cd art-tools \
&& git pull \
&& ./install.sh
RUN git clone https://github.com/openshift-eng/art-tools.git \
&& cd art-tools \
&& ./install.sh \
&& cd .. \
&& rm -rf art-tools

# Install dependencies from requirements.txt
COPY requirements.txt requirements-dev.txt ./
Expand Down
14 changes: 7 additions & 7 deletions container/Dockerfile.latest
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,16 @@ ARG USERNAME=dev
ARG USER_UID=1000
ARG USER_GID=$USER_UID

WORKDIR /workspaces/art-bot

RUN git config --global --add safe.directory /workspaces/art-bot/art-tools

# Looks like we need a USER 0 here
# Switch to root user for git operations
USER 0
# Clone art-tools and run install.sh script
RUN cd art-tools \
&& git pull \
&& ./install.sh
# Update art-tools and run the install script
RUN git clone https://github.com/openshift-eng/art-tools.git \
&& cd art-tools \
&& ./install.sh \
&& cd .. \
&& rm -rf art-tools # Clone, update, install, and then remove art-tools

# Install dependencies from requirements.txt
COPY requirements.txt ./
Expand Down