Skip to content

Commit

Permalink
Fix python3.11 and JDK install (#22)
Browse files Browse the repository at this point in the history
* fix flink install
* fix sync job
  • Loading branch information
haobibo authored Nov 4, 2024
1 parent 6d0eae2 commit e3f922c
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 5 deletions.
7 changes: 4 additions & 3 deletions .github/workflows/build-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ jobs:
- uses: actions/checkout@v4
- run: |
source ./tool.sh
build_image bigdata latest docker_bigdata/Dockerfile && push_image
build_image bigdata latest docker_bigdata/Dockerfile --build-arg "ARG_PROFILE_JAVA=base" --build-arg "VERSION_JDK=11"
push_image
qpod_elasticsearch:
name: "elasticsearch"
Expand Down Expand Up @@ -83,8 +84,8 @@ jobs:
## Sync all images in this build (listed by "names") to mirror registry.
sync_images: # "qpod_bigdata",
needs: ["qpod_elasticsearch", "qpod_kafka_confluent", "qpod_postgres-17-ext", "qpod_postgres-16-ext", "qpod_postgres-15-ext"]
sync_images:
needs: ["qpod_bigdata", "qpod_elasticsearch", "qpod_kafka_confluent", "qpod_postgres-17-ext", "qpod_postgres-16-ext", "qpod_postgres-15-ext"]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
Expand Down
11 changes: 9 additions & 2 deletions docker_bigdata/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
# Distributed under the terms of the Modified BSD License.

ARG BASE_NAMESPACE
ARG BASE_IMG="jdk-11"
ARG BASE_IMG="python-3.11"
FROM ${BASE_NAMESPACE:+$BASE_NAMESPACE/}${BASE_IMG}

LABEL maintainer="[email protected]"

ARG ARG_PROFILE_JAVA
ARG VERSION_JDK

COPY work /opt/utils/

ENV CONDA_PREFIX=/opt/conda
Expand All @@ -16,7 +19,11 @@ RUN set -eux \
&& source /opt/utils/script-setup.sh \
&& source /opt/utils/script-setup-db-clients.sh \
&& install_apt /opt/utils/install_list_base.apt \
# && echo "Install tini" && setup_tini \
# -----------------------------
&& echo "If installing Java environment - notice that Java can be dependency for some other packages like flink" \
&& export VERSION_JDK=${VERSION_JDK:-11} \
&& for profile in $(echo $ARG_PROFILE_JAVA | tr "," "\n") ; do ( setup_java_${profile} ) ; done \
# -----------------------------
&& echo "Install postgresql client:" && setup_postgresql_client \
&& echo "Install mysql client:" && setup_mysql_client \
&& echo "Install mongosh:" && setup_mongosh_client \
Expand Down

0 comments on commit e3f922c

Please sign in to comment.