Skip to content

Commit d7a3e95

Browse files
committed
fix: version must have 3 parts always and forever
1 parent 827f9a0 commit d7a3e95

File tree

7 files changed

+443
-165
lines changed

7 files changed

+443
-165
lines changed

build/centos7/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ FROM centos:7
77
# Should set ID_REL_BASE and ID_PATCH build args.
88
#
99

10-
ARG ID_REL_BASE=2020.1
10+
ARG ID_REL_BASE=2020.1.0
1111
ARG ID_PATCH=9999999
1212
ENV PKGNAME helix-auth-svc
1313
ENV DIRNAME helix-auth-svc-${ID_REL_BASE}

build/centos8/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ FROM centos:8
77
# Should set ID_REL_BASE and ID_PATCH build args.
88
#
99

10-
ARG ID_REL_BASE=2020.1
10+
ARG ID_REL_BASE=2020.1.0
1111
ARG ID_PATCH=9999999
1212
ENV PKGNAME helix-auth-svc
1313
ENV DIRNAME helix-auth-svc-${ID_REL_BASE}

build/rpm/helix-auth-svc.spec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ cp -pr views/* %{buildroot}%{installprefix}/views
5555
cp ecosystem.config.js %{buildroot}%{installprefix}/ecosystem.config.js
5656
cp logging.config.js %{buildroot}%{installprefix}/logging.config.js
5757
cp package-lock.json %{buildroot}%{installprefix}/package-lock.json
58-
sed -e "s/\"2020.1\"/\"${ID_REL_BASE}.${ID_PATCH}\"/" \
58+
sed -e "s/\"2020.1.0\"/\"${ID_REL_BASE}.${ID_PATCH}\"/" \
5959
-e "s|+MAIN+|%{hasversion}|" \
6060
package.json > %{buildroot}%{installprefix}/package.json
6161
cp README.md %{buildroot}%{installprefix}/README.md

build/ubuntu16/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ FROM ubuntu:16.04
77
# Should set ID_REL_BASE and ID_PATCH build args.
88
#
99

10-
ARG ID_REL_BASE=2020.1
10+
ARG ID_REL_BASE=2020.1.0
1111
ARG ID_PATCH=9999999
1212
ENV HAS_VERSION "HAS/noarch/${ID_REL_BASE}/${ID_PATCH}"
1313
ENV DIRNAME helix-auth-svc-${ID_REL_BASE}
@@ -44,7 +44,7 @@ COPY ecosystem.config.js ecosystem.config.js
4444
COPY logging.config.js logging.config.js
4545
COPY package-lock.json package-lock.json
4646
COPY package.json package.json.in
47-
RUN sed -e "s/\"2020.1\"/\"${ID_REL_BASE}.${ID_PATCH}\"/" \
47+
RUN sed -e "s/\"2020.1.0\"/\"${ID_REL_BASE}.${ID_PATCH}\"/" \
4848
-e "s|+MAIN+|${HAS_VERSION}|" package.json.in > package.json && \
4949
rm -f package.json.in
5050
COPY README.md README.md

build/ubuntu18/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ FROM ubuntu:18.04
77
# Should set ID_REL_BASE and ID_PATCH build args.
88
#
99

10-
ARG ID_REL_BASE=2020.1
10+
ARG ID_REL_BASE=2020.1.0
1111
ARG ID_PATCH=9999999
1212
ENV HAS_VERSION "HAS/noarch/${ID_REL_BASE}/${ID_PATCH}"
1313
ENV DIRNAME helix-auth-svc-${ID_REL_BASE}
@@ -44,7 +44,7 @@ COPY ecosystem.config.js ecosystem.config.js
4444
COPY logging.config.js logging.config.js
4545
COPY package-lock.json package-lock.json
4646
COPY package.json package.json.in
47-
RUN sed -e "s/\"2020.1\"/\"${ID_REL_BASE}.${ID_PATCH}\"/" \
47+
RUN sed -e "s/\"2020.1.0\"/\"${ID_REL_BASE}.${ID_PATCH}\"/" \
4848
-e "s|+MAIN+|${HAS_VERSION}|" package.json.in > package.json && \
4949
rm -f package.json.in
5050
COPY README.md README.md

0 commit comments

Comments
 (0)