Skip to content

Commit

Permalink
Merge pull request #4038 from spadgett/revert-builder
Browse files Browse the repository at this point in the history
Revert builder image dependency bumps
  • Loading branch information
openshift-merge-robot committed Jan 22, 2020
2 parents a8c279d + 392b8b6 commit 9b3b276
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 11 deletions.
8 changes: 4 additions & 4 deletions Dockerfile.builder
Expand Up @@ -8,7 +8,7 @@
# You can test the image using `./builder-run.sh`. For instance:
# $ ./builder-run.sh ./build-backend.sh

FROM golang:1.13-buster
FROM golang:1.13-stretch

MAINTAINER Ed Rooth - CoreOS

Expand All @@ -17,8 +17,8 @@ RUN go get -u golang.org/x/lint/golint
RUN go get github.com/jstemmer/go-junit-report

### Install NodeJS and yarn
ENV NODE_VERSION="v13.6.0"
ENV YARN_VERSION="v1.21.1"
ENV NODE_VERSION="v10.17.0"
ENV YARN_VERSION="v1.7.0"

# yarn needs a home writable by any user running the container
ENV HOME /opt/home
Expand All @@ -29,7 +29,7 @@ RUN apt-get update \
&& apt-get install --no-install-recommends -y -q \
curl wget git unzip bzip2 jq

RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.17.1/bin/linux/amd64/kubectl && \
RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.17.0/bin/linux/amd64/kubectl && \
chmod +x ./kubectl && \
mv ./kubectl /usr/local/bin/kubectl

Expand Down
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -134,7 +134,7 @@ See [STYLEGUIDE](STYLEGUIDE.md) for file format and coding style guide.

### Dev Dependencies

go 1.11+, nodejs/yarn, kubectl
go 1.13+, nodejs/yarn, kubectl

### Frontend Development

Expand Down
7 changes: 1 addition & 6 deletions frontend/public/components/utils/units.js
Expand Up @@ -138,8 +138,7 @@ const formatValue = (value, options) => {
maximumFractionDigits: fractionDigits,
});

// Handle special case of `-0`, which can be printed as "-0" in some environments.
if (!isFinite(value) || value === 0) {
if (!isFinite(value)) {
return Intl.NumberFormat(locales, rest).format(0);
}
return Intl.NumberFormat(locales, rest).format(value);
Expand Down Expand Up @@ -202,10 +201,6 @@ const formatPercentage = (value, options) => {
maximumFractionDigits: 1,
},
);
// Handle special case of `-0`, which can be printed as "-0" in some environments.
if (!isFinite(value) || value === 0) {
return Intl.NumberFormat(locales, rest).format(0);
}
return Intl.NumberFormat(locales, rest).format(value);
};

Expand Down

0 comments on commit 9b3b276

Please sign in to comment.