@@ -44,6 +44,8 @@ function cacheDockerImages {
44
44
45
45
local result=0
46
46
47
+ mkdir -p ~ /.m2/repository
48
+
47
49
app_temp_dir=" ${app_dir} -temp"
48
50
rm -rf ${app_temp_dir}
49
51
mkdir -p ${app_temp_dir}
@@ -54,38 +56,41 @@ function cacheDockerImages {
54
56
appsody init java-microprofile
55
57
fi
56
58
opendjk_local_docker_context_dir=" ${app_temp_dir} /tmp"
57
- if [ ${cygwin} -eq 0 ]; then
59
+ if [ ${cygwin} -eq 1 ]; then
60
+ cmd /c " appsody extract --target-dir tmp"
61
+ else
58
62
appsody extract --target-dir " ${opendjk_local_docker_context_dir} "
63
+ fi
59
64
60
- cp " ${workshop_dir} /stacks/experimental/java-microprofile-dev-mode/image/project/pom-dev.xml" " ${opendjk_local_docker_context_dir} "
65
+ cp " ${workshop_dir} /stacks/experimental/java-microprofile-dev-mode/image/project/pom-dev.xml" " ${opendjk_local_docker_context_dir} "
61
66
62
- opendjk_local_dockerfile=" ${opendjk_local_docker_context_dir} /Dockerfile"
63
- cat > " ${opendjk_local_dockerfile} " << EOF
67
+ opendjk_local_dockerfile=" ${opendjk_local_docker_context_dir} /Dockerfile"
68
+ cat > " ${opendjk_local_dockerfile} " << EOF
64
69
FROM adoptopenjdk/openjdk8-openj9
65
70
66
71
COPY pom.xml /project/
67
72
COPY pom-dev.xml /project/
68
73
COPY user-app/pom.xml /project/user-app/
69
74
70
75
RUN apt-get update && \
71
- apt-get install -y maven unzip && \
72
- sed -i "s|19.0.0.8|19.0.0.7|g" /project/pom.xml && \
73
- mvn -q -B -f /project/pom.xml install dependency:go-offline && \
74
- mvn -q -B -f /project/user-app/pom.xml checkstyle:checkstyle install dependency:go-offline && \
75
- mvn -q -B -f /project/pom-dev.xml checkstyle:checkstyle install dependency:go-offline && \
76
- sed -i "s|19.0.0.7|19.0.0.8|g" /project/pom.xml && \
77
- mvn -q -B -f /project/pom.xml install dependency:go-offline && \
78
- mvn -q -B -f /project/user-app/pom.xml dependency:go-offline && \
79
- rm -rf /project
76
+ apt-get install -y maven unzip && \
77
+ sed -i "s|19.0.0.8|19.0.0.7|g" /project/pom.xml && \
78
+ mvn -q -B -f /project/pom.xml install dependency:go-offline && \
79
+ mvn -q -B -f /project/user-app/pom.xml checkstyle:checkstyle install dependency:go-offline && \
80
+ mvn -q -B -f /project/pom-dev.xml checkstyle:checkstyle install dependency:go-offline && \
81
+ sed -i "s|19.0.0.7|19.0.0.8|g" /project/pom.xml && \
82
+ mvn -q -B -f /project/pom.xml install dependency:go-offline && \
83
+ mvn -q -B -f /project/user-app/pom.xml dependency:go-offline && \
84
+ rm -rf /project
80
85
EOF
81
86
82
- docker build " ${opendjk_local_docker_context_dir} " --tag openjdk8-openj9-local && \
83
- docker image ls openjdk8-openj9-local
84
- local result=$?
87
+ cd " ${opendjk_local_docker_context_dir} "
88
+ docker build . --tag openjdk8-openj9-local && \
89
+ docker image ls openjdk8-openj9-local
90
+ local result=$?
85
91
86
- rm -rf " ${app_temp_dir} "
87
- result=$?
88
- fi
92
+ rm -rf " ${app_temp_dir} "
93
+ result=$?
89
94
90
95
echo
91
96
echo " INFO: Caching additional docker images to be used in examples."
0 commit comments