diff options
| author | jtomass <juhani@vaadin.com> | 2017-11-29 10:59:23 +0200 |
|---|---|---|
| committer | Teemu Suo-Anttila <tsuoanttila@users.noreply.github.com> | 2017-11-29 10:59:23 +0200 |
| commit | e38e1f905792a2941adcb70c07e464c43b773ec7 (patch) | |
| tree | 3c96fb49cc98b7e9863afcc2aa123a08d7e3f181 | |
| parent | 000ece94d8755e440f31404c44e0d5be3a18047c (diff) | |
| download | vaadin-framework-e38e1f905792a2941adcb70c07e464c43b773ec7.tar.gz vaadin-framework-e38e1f905792a2941adcb70c07e464c43b773ec7.zip | |
Fix alpine docker image error (#10382)
| -rw-r--r-- | scripts/BuildHelpers.py | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/scripts/BuildHelpers.py b/scripts/BuildHelpers.py index 9dd7ab66e0..216f8e1646 100644 --- a/scripts/BuildHelpers.py +++ b/scripts/BuildHelpers.py @@ -142,18 +142,17 @@ def removeDir(subdir): rmtree(join(resultPath, subdir)) def dockerWrap(imageVersion, imageName = "demo-validation"): - dockerFileContent = """FROM jetty:jre8-alpine -MAINTAINER FrameworkTeam - -RUN apk add --update sed - -#Autodeploy folder: -#/var/lib/jetty/webapps/ + dockerFileContent = """FROM jtomass/alpine-jre-bash:latest +LABEL maintainer="FrameworkTeam" COPY ./*.war /var/lib/jetty/webapps/ +USER root +RUN mkdir /opt +RUN chown -R jetty:jetty /opt COPY ./index-generate.sh /opt/ RUN chmod +x /opt/index-generate.sh +USER jetty RUN /opt/index-generate.sh RUN mkdir -p /var/lib/jetty/webapps/root && \ |