File tree Expand file tree Collapse file tree 3 files changed +10
-3
lines changed
Expand file tree Collapse file tree 3 files changed +10
-3
lines changed Original file line number Diff line number Diff line change 11%define p4release %(echo -n $ID_REL_BASE)
22%define p4change %(echo -n $ID_PATCH)
3+ %define hasversion %(echo -n "HAS/noarch /${ID_REL_BASE}/${ID_PATCH}")
34%define installprefix /opt/perforce/helix-auth-svc
45
56Name: helix-auth-svc
@@ -49,7 +50,9 @@ cp -pr views/* %{buildroot}%{installprefix}/views
4950cp ecosystem.config.js %{buildroot }%{installprefix }/ecosystem.config.js
5051cp logging.config.js %{buildroot }%{installprefix }/logging.config.js
5152cp package-lock.json %{buildroot }%{installprefix }/package-lock.json
52- sed -e "s/\"2020.1.9999999\"/\"${ID_REL_BASE}\"/" package.json > %{buildroot }%{installprefix }/package.json
53+ sed -e "s/\"2019.1.1-000001\"/\"${ID_REL_BASE}.${ID_PATCH}\"/" \
54+ -e "s|+MAIN+|%{hasversion }|" \
55+ package.json > %{buildroot }%{installprefix }/package.json
5356cp README.md %{buildroot }%{installprefix }/README.md
5457
5558%files
Original file line number Diff line number Diff line change @@ -8,6 +8,7 @@ FROM ubuntu:16.04
88
99ARG ID_REL_BASE=2020.1
1010ARG ID_PATCH=9999999
11+ ENV HAS_VERSION "HAS/noarch/${ID_REL_BASE}/${ID_PATCH}"
1112ENV DIRNAME helix-auth-svc-${ID_REL_BASE}
1213ENV PKGNAME helix-auth-svc_${ID_REL_BASE}
1314ENV PACKAGE_FILENAME ${PKGNAME}-${ID_PATCH}~xenial_amd64.deb
@@ -42,7 +43,8 @@ COPY ecosystem.config.js ecosystem.config.js
4243COPY logging.config.js logging.config.js
4344COPY package-lock.json package-lock.json
4445COPY package.json package.json.in
45- RUN sed -e "s/\" 2020.1.9999999\" /\" ${ID_REL_BASE}.${ID_PATCH}\" /" package.json.in > package.json && \
46+ RUN sed -e "s/\" 2019.1.1-000001\" /\" ${ID_REL_BASE}.${ID_PATCH}\" /" \
47+ -e "s|+MAIN+|${HAS_VERSION}|" package.json.in > package.json && \
4648 rm -f package.json.in
4749COPY README.md README.md
4850
Original file line number Diff line number Diff line change @@ -8,6 +8,7 @@ FROM ubuntu:18.04
88
99ARG ID_REL_BASE=2020.1
1010ARG ID_PATCH=9999999
11+ ENV HAS_VERSION "HAS/noarch/${ID_REL_BASE}/${ID_PATCH}"
1112ENV DIRNAME helix-auth-svc-${ID_REL_BASE}
1213ENV PKGNAME helix-auth-svc_${ID_REL_BASE}
1314ENV PACKAGE_FILENAME ${PKGNAME}-${ID_PATCH}~bionic_amd64.deb
@@ -42,7 +43,8 @@ COPY ecosystem.config.js ecosystem.config.js
4243COPY logging.config.js logging.config.js
4344COPY package-lock.json package-lock.json
4445COPY package.json package.json.in
45- RUN sed -e "s/\" 2020.1.9999999\" /\" ${ID_REL_BASE}.${ID_PATCH}\" /" package.json.in > package.json && \
46+ RUN sed -e "s/\" 2019.1.1-000001\" /\" ${ID_REL_BASE}.${ID_PATCH}\" /" \
47+ -e "s|+MAIN+|${HAS_VERSION}|" package.json.in > package.json && \
4648 rm -f package.json.in
4749COPY README.md README.md
4850
You can’t perform that action at this time.
0 commit comments