Skip to content

Commit

Permalink
Fix Dockerfile issues
Browse files Browse the repository at this point in the history
Reviewed-by: rwestberg
  • Loading branch information
Junyuan Zheng authored and rwestberg committed Jul 30, 2020
1 parent a813417 commit 8112650
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions bots.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ ENV LC_ALL en_US.UTF-8
RUN yum -y install unzip

COPY gradlew ./
COPY deps.env ./

ENV JAVA_TOOL_OPTIONS=$JAVA_OPTIONS
RUN sh gradlew --no-daemon --version $GRADLE_OPTIONS
Expand Down Expand Up @@ -104,12 +105,12 @@ RUN yum -y install rsync unzip && yum clean all

COPY --from=prerequisites-runtime /bots/git/ /bots/git/
COPY --from=prerequisites-runtime /bots/hg/ /bots/hg/
COPY --from=builder /bots-build/bots/cli/build/distributions/cli-unknown-linux.tar.gz /bots/tar/
COPY --from=builder /bots-build/bots/cli/build/distributions/cli-unknown-linux-x64.tar.gz /bots/tar/

ENV JAVA_TOOL_OPTIONS=$JAVA_OPTIONS
ENV PATH=/bots/git/bin:/bots/hg/bin:${PATH}

RUN tar xvf /bots/tar/cli-unknown-linux.tar.gz
RUN tar xvf /bots/tar/cli-unknown-linux-x64.tar.gz

ENTRYPOINT ["/bots/bin/skara-bots"]
CMD ["--help"]

1 comment on commit 8112650

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented on 8112650 Jul 30, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.