File tree Expand file tree Collapse file tree 10 files changed +16
-16
lines changed
Expand file tree Collapse file tree 10 files changed +16
-16
lines changed Original file line number Diff line number Diff line change @@ -18,7 +18,7 @@ ADD https://rpm.nodesource.com/setup_16.x setup_16.x
1818RUN bash setup_16.x
1919RUN yum -q -y install nodejs
2020
21- ARG ID_REL_BASE=2021.2 .0
21+ ARG ID_REL_BASE=2022.1 .0
2222ARG ID_PATCH=9999999
2323ENV PKGNAME helix-auth-svc
2424ENV DIRNAME helix-auth-svc-${ID_REL_BASE}
Original file line number Diff line number Diff line change @@ -20,7 +20,7 @@ RUN yum -q -y install --nogpgcheck -y nodejs
2020# (base image has rpmdevtools, rpm-build already)
2121# RUN yum -q -y install rpmdevtools rpm-build
2222
23- ARG ID_REL_BASE=2021.2 .0
23+ ARG ID_REL_BASE=2022.1 .0
2424ARG ID_PATCH=9999999
2525ENV PKGNAME helix-auth-svc
2626ENV DIRNAME helix-auth-svc-${ID_REL_BASE}
Original file line number Diff line number Diff line change @@ -60,7 +60,7 @@ cp example.env %{buildroot}%{installprefix}/example.env
6060cp logging.config.cjs %{buildroot }%{installprefix }/logging.config.cjs
6161cp sentinel.config.cjs %{buildroot }%{installprefix }/sentinel.config.cjs
6262cp package-lock.json %{buildroot }%{installprefix }/package-lock.json
63- sed -e "s/\"2021.2 .0\"/\"${ID_REL_BASE}-${ID_PATCH}\"/" \
63+ sed -e "s/\"2022.1 .0\"/\"${ID_REL_BASE}-${ID_PATCH}\"/" \
6464 -e "s|+MAIN+|%{hasversion }|" \
6565 package.json > %{buildroot }%{installprefix }/package.json
6666cp README.md %{buildroot }%{installprefix }/README.md
Original file line number Diff line number Diff line change @@ -25,7 +25,7 @@ RUN apt-get -q -y install nodejs
2525#
2626FROM ubuntu16_pkg_base
2727
28- ARG ID_REL_BASE=2021.2 .0
28+ ARG ID_REL_BASE=2022.1 .0
2929ARG ID_PATCH=9999999
3030ENV HAS_VERSION "HAS/noarch/${ID_REL_BASE}/${ID_PATCH}"
3131ENV DIRNAME helix-auth-svc-${ID_REL_BASE}
@@ -51,7 +51,7 @@ COPY logging.config.cjs logging.config.cjs
5151COPY sentinel.config.cjs sentinel.config.cjs
5252COPY package-lock.json package-lock.json
5353COPY package.json package.json.in
54- RUN sed -e "s/\" 2021.2 .0\" /\" ${ID_REL_BASE}-${ID_PATCH}\" /" \
54+ RUN sed -e "s/\" 2022.1 .0\" /\" ${ID_REL_BASE}-${ID_PATCH}\" /" \
5555 -e "s|+MAIN+|${HAS_VERSION}|" package.json.in > package.json && \
5656 rm -f package.json.in
5757COPY README.md README.md
Original file line number Diff line number Diff line change @@ -28,7 +28,7 @@ RUN apt-get -q -y install nodejs
2828#
2929FROM ubuntu18_pkg_base
3030
31- ARG ID_REL_BASE=2021.2 .0
31+ ARG ID_REL_BASE=2022.1 .0
3232ARG ID_PATCH=9999999
3333ENV HAS_VERSION "HAS/noarch/${ID_REL_BASE}/${ID_PATCH}"
3434ENV DIRNAME helix-auth-svc-${ID_REL_BASE}
@@ -54,7 +54,7 @@ COPY logging.config.cjs logging.config.cjs
5454COPY sentinel.config.cjs sentinel.config.cjs
5555COPY package-lock.json package-lock.json
5656COPY package.json package.json.in
57- RUN sed -e "s/\" 2021.2 .0\" /\" ${ID_REL_BASE}-${ID_PATCH}\" /" \
57+ RUN sed -e "s/\" 2022.1 .0\" /\" ${ID_REL_BASE}-${ID_PATCH}\" /" \
5858 -e "s|+MAIN+|${HAS_VERSION}|" package.json.in > package.json && \
5959 rm -f package.json.in
6060COPY README.md README.md
Original file line number Diff line number Diff line change @@ -24,7 +24,7 @@ RUN apt-get -q -y install nodejs
2424
2525FROM ubuntu20_pkg_base
2626
27- ARG ID_REL_BASE=2021.2 .0
27+ ARG ID_REL_BASE=2022.1 .0
2828ARG ID_PATCH=9999999
2929ENV HAS_VERSION "HAS/noarch/${ID_REL_BASE}/${ID_PATCH}"
3030ENV DIRNAME helix-auth-svc-${ID_REL_BASE}
@@ -50,7 +50,7 @@ COPY logging.config.cjs logging.config.cjs
5050COPY sentinel.config.cjs sentinel.config.cjs
5151COPY package-lock.json package-lock.json
5252COPY package.json package.json.in
53- RUN sed -e "s/\" 2021.2 .0\" /\" ${ID_REL_BASE}-${ID_PATCH}\" /" \
53+ RUN sed -e "s/\" 2022.1 .0\" /\" ${ID_REL_BASE}-${ID_PATCH}\" /" \
5454 -e "s|+MAIN+|${HAS_VERSION}|" package.json.in > package.json && \
5555 rm -f package.json.in
5656COPY README.md README.md
Original file line number Diff line number Diff line change 33#
44# Build:
55#
6- # $ docker build -t helix-auth-svc:latest -t helix-auth-svc:2021.2 -f containers/hub/Dockerfile .
6+ # $ docker build -t helix-auth-svc:latest -t helix-auth-svc:2022.1 -f containers/hub/Dockerfile .
77# $ docker tag helix-auth-svc:latest perforce/helix-auth-svc:latest
8- # $ docker tag helix-auth-svc:2021.2 perforce/helix-auth-svc:2021.2
8+ # $ docker tag helix-auth-svc:2022.1 perforce/helix-auth-svc:2022.1
99# $ docker push --all-tags perforce/helix-auth-svc
1010#
1111# Run:
Original file line number Diff line number Diff line change 11{
22 "name" : " helix-auth-svc" ,
3- "version" : " 2021.2 .0" ,
3+ "version" : " 2022.1 .0" ,
44 "description" : " Helix Authentication Service: +MAIN+" ,
55 "bin" : {
66 "auth-svc" : " ./bin/www.js"
Original file line number Diff line number Diff line change @@ -11,15 +11,15 @@ const defaultConfig = {
1111 user : 'bruno' ,
1212 password : 'p8ssword' ,
1313 prog : 'p4api' ,
14- progv : '2021.2 .0' ,
14+ progv : '2022.1 .0' ,
1515 p4root : './tmp/p4d/nonssl'
1616}
1717
1818const defaultSslConfig = {
1919 user : 'bruno' ,
2020 password : 'p8ssword' ,
2121 prog : 'p4api' ,
22- progv : '2021.2 .0' ,
22+ progv : '2022.1 .0' ,
2323 p4root : './tmp/p4d/ssl'
2424}
2525
You can’t perform that action at this time.
0 commit comments