Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch Docker to Eclipse Temurin and support ppc64le #13522

Merged
merged 2 commits into from
Aug 7, 2022
Merged

Switch Docker to Eclipse Temurin and support ppc64le #13522

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c452a5d
Switch Docker to Eclipse Temurin
electrum Aug 5, 2022
1908fc6
Add Docker image for ppc64le
electrum Aug 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ jobs:
run: $MAVEN clean -pl '!:trino-server,!:trino-cli'
- uses: docker/setup-qemu-action@v1
with:
platforms: arm64
platforms: arm64,ppc64le
- name: Test Docker Image
run: core/docker/build.sh

Expand Down
13 changes: 5 additions & 8 deletions core/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,14 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
FROM registry.access.redhat.com/ubi8/ubi
FROM eclipse-temurin:17.0.4_8-jdk

ENV JAVA_HOME /usr/lib/jvm/zulu17
RUN \
set -xeu && \
yum -y -q install https://cdn.azul.com/zulu/bin/zulu-repo-1.0.0-1.noarch.rpm && \
yum -y -q install python3 zulu17-jdk less && \
yum -q clean all && \
rm -rf /var/cache/yum && \
alternatives --set python /usr/bin/python3 && \
apt-get update -q && \
apt-get install -y -q less python3 && \
rm -rf /var/lib/apt/lists/* && \
update-alternatives --install /usr/bin/python python /usr/bin/python3 1 && \
groupadd trino --gid 1000 && \
useradd trino --uid 1000 --gid 1000 --create-home && \
mkdir -p /usr/lib/trino /data/trino && \
Expand All @@ -33,7 +31,6 @@ COPY --chown=trino:trino default/etc /etc/trino

EXPOSE 8080
USER trino:trino
ENV LANG en_US.UTF-8
CMD ["/usr/lib/trino/bin/run-trino"]
HEALTHCHECK --interval=10s --timeout=5s --start-period=10s \
CMD /usr/lib/trino/bin/health-check
7 changes: 5 additions & 2 deletions core/docker/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Builds the Trino Docker image
EOF
}

ARCHITECTURES=(amd64 arm64)
ARCHITECTURES=(amd64 arm64 ppc64le)
TRINO_VERSION=

while getopts ":a:h:r:" o; do
Expand Down Expand Up @@ -87,6 +87,9 @@ echo "🏃 Testing built images"
source container-test.sh

for arch in "${ARCHITECTURES[@]}"; do
test_container "${TAG_PREFIX}-$arch" "linux/$arch"
# TODO: remove when https://github.com/multiarch/qemu-user-static/issues/128 is fixed
if [[ "$arch" != "ppc64le" ]]; then
test_container "${TAG_PREFIX}-$arch" "linux/$arch"
fi
docker image inspect -f '🚀 Built {{.RepoTags}} {{.Id}}' "${TAG_PREFIX}-$arch"
done