Skip to content

Commit

Permalink
Merge pull request #3800 from control-center/feature/CC-4355
Browse files Browse the repository at this point in the history
CC-4355: Merge-rpm-build jenkins job is failing
  • Loading branch information
Deer-WarLord authored Jul 9, 2020
2 parents 83a9634 + 93eefc2 commit e17a688
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions build/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ RUN apt-get update -qq && apt-get install -qqy iptables ca-certificates aufs-too
RUN apt-get update -qq && apt-get install -y -q wget curl git unzip

# Install Go
RUN curl -s https://storage.googleapis.com/golang/go1.7.4.linux-amd64.tar.gz | tar -v -C /usr/local -xz
RUN curl -s https://dl.google.com/go/go1.14.4.linux-amd64.tar.gz | tar -v -C /usr/local -xz
ENV GOPATH /go
ENV PATH $PATH:/go/bin:/usr/local/go/bin
RUN go get github.com/tools/godep
Expand Down Expand Up @@ -63,8 +63,8 @@ RUN apt-get update -qq && apt-get install -y -q --force-yes google-chrome-stable


# Install nodejs, npm, gulp, etc
RUN curl -sL https://deb.nodesource.com/setup_6.x | bash -
RUN apt update -qq && apt install -y nodejs=6.12.3-1nodesource1
RUN curl -sL https://deb.nodesource.com/setup_12.x | bash -
RUN apt update -qq && apt install -y nodejs=12.18.2-1nodesource1
#RUN apt-get update -qq && apt-get install -y -q nodejs=0.10.25~dfsg2-2ubuntu1 npm=1.3.10~dfsg-1
# karma has dependencies that need to run native builds, so we need build-essential
RUN apt-get update -qq && apt-get install -yq build-essential=12.1ubuntu2
Expand Down

0 comments on commit e17a688

Please sign in to comment.