Skip to content

Commit 5e04af8

Browse files
authored
Fix scio playground (#36748)
1 parent 25e50e7 commit 5e04af8

File tree

2 files changed

+12
-4
lines changed

2 files changed

+12
-4
lines changed

playground/backend/containers/scio/Dockerfile

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# See the License for the specific language governing permissions and
1616
# limitations under the License.
1717
###############################################################################
18-
ARG BASE_IMAGE=openjdk:11
18+
ARG BASE_IMAGE=eclipse-temurin:11
1919
FROM golang:1-bullseye AS build
2020
ARG GIT_COMMIT="<unknown>"
2121
ARG GIT_TIMESTAMP="0"
@@ -80,9 +80,17 @@ RUN chown -R appuser:appgroup /opt/playground/backend/executable_files/ && chmod
8080
RUN mkdir -p /opt/sbt-template
8181
RUN chown -R appuser:appgroup /opt/sbt-template
8282

83+
ARG DEBIAN_FRONTEND=noninteractive
84+
RUN apt-get update \
85+
&& apt-get install -y --no-install-recommends unzip \
86+
&& rm -rf /var/lib/apt/lists/* \
87+
8388
#Download spotify g8 template at specific commit
84-
ARG g8_commit=7c1ba7c1651dfd70976028842e721da4107c0d6d
85-
RUN wget https://codeload.github.com/spotify/scio.g8/zip/$g8_commit -O scio.g8.zip && unzip scio.g8.zip && mv scio.g8-$g8_commit /opt/scio.g8
89+
#ARG g8_commit=7c1ba7c1651dfd70976028842e721da4107c0d6d
90+
91+
RUN apt-get update && apt-get install -y --no-install-recommends git && rm -rf /var/lib/apt/lists/*
92+
RUN git clone https://github.com/spotify/scio.g8 /opt/scio.g8 && \
93+
cd /opt/scio.g8 && git checkout "7c1ba7c1651dfd70976028842e721da4107c0d6d"
8694

8795
# Switch to appuser
8896
USER appuser

playground/backend/containers/scio/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ docker {
7171
buildArgs(
7272
['BASE_IMAGE' : project.rootProject.hasProperty(["base-image"]) ?
7373
project.rootProject["base-image"] :
74-
"openjdk:11",
74+
"eclipse-temurin:11",
7575
'GIT_COMMIT' : getGitCommitHash(),
7676
'GIT_TIMESTAMP': getGitCommitTimestamp()])
7777
}

0 commit comments

Comments
 (0)