fix docker build
This commit is contained in:
parent
06bfb179fa
commit
79088ad5b9
|
|
@ -1,5 +1,7 @@
|
||||||
FROM alpine:latest
|
FROM alpine:latest
|
||||||
|
|
||||||
|
ARG VERSION
|
||||||
|
|
||||||
RUN apk add --no-cache openjdk25
|
RUN apk add --no-cache openjdk25
|
||||||
|
|
||||||
RUN mkdir -p /data /data/local
|
RUN mkdir -p /data /data/local
|
||||||
|
|
@ -7,6 +9,8 @@ RUN mkdir -p /data /data/local
|
||||||
COPY docker/config.json /data/config.json
|
COPY docker/config.json /data/config.json
|
||||||
COPY docker/entrypoint.sh /entrypoint.sh
|
COPY docker/entrypoint.sh /entrypoint.sh
|
||||||
|
|
||||||
|
COPY launcher/target/${VERSION}.pfapp /default.pfapp
|
||||||
|
|
||||||
RUN chmod +x /entrypoint.sh
|
RUN chmod +x /entrypoint.sh
|
||||||
|
|
||||||
ENTRYPOINT ["/entrypoint.sh"]
|
ENTRYPOINT ["/entrypoint.sh"]
|
||||||
|
|
|
||||||
|
|
@ -46,7 +46,7 @@ pipeline {
|
||||||
|
|
||||||
stage('Build docker image') {
|
stage('Build docker image') {
|
||||||
steps {
|
steps {
|
||||||
sh "docker build -f Dockerfile -t pfsdn:${VERSION} ."
|
sh "docker build -f Dockerfile --build-arg VERSION=${VERSION} -t pfsdn:${VERSION} ."
|
||||||
echo "Saving docker image pfsdn:${VERSION}"
|
echo "Saving docker image pfsdn:${VERSION}"
|
||||||
sh "docker save pfsdn:${VERSION} | gzip > pfsdn-${VERSION}.tar.gz"
|
sh "docker save pfsdn:${VERSION} | gzip > pfsdn-${VERSION}.tar.gz"
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,4 +0,0 @@
|
||||||
#!/bin/sh
|
|
||||||
|
|
||||||
docker build -f docker/Dockerfile -t pfsdn .
|
|
||||||
docker save -o pfsdn.tar pfsdn
|
|
||||||
|
|
@ -1,2 +1,2 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
exec java -Xmx256m -Dapp.external.management=true -jar default.pfapp --c=/data/config.json -l=. -r="https://repo.kirillius.ru/apps/pf/"
|
exec java -Xmx256m -Dapp.external.management=true -jar default.pfapp --c=/data/config.json -l=. -r="https://objects.repo.kirillius.ru/service/rest/repository/browse/object-storage/apps/"
|
||||||
Loading…
Reference in New Issue