This is an automated email from the ASF dual-hosted git repository. jonnybot pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/groovy-geb.git
commit c4a405625f1c9aef6aebc924f1c069af82cd5cbb Author: Carl Marcum <[email protected]> AuthorDate: Wed Apr 1 17:56:38 2026 -0400 revert changes to build-in-docker.sh and delete dockerfile and docker-entrypoint.sh. --- Dockerfile | 61 ---------------------------------------------------- build-in-docker.sh | 28 ++++++++++-------------- docker-entrypoint.sh | 37 ------------------------------- 3 files changed, 11 insertions(+), 115 deletions(-) diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index ddecce9a..00000000 --- a/Dockerfile +++ /dev/null @@ -1,61 +0,0 @@ -# ---------------------------------------------------------------------------- -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# ---------------------------------------------------------------------------- - -# FROM gebish/ci:v13 -FROM eclipse-temurin:11-jdk - -RUN wget https://launchpad.net/~xtradeb/+archive/ubuntu/apps/+files/xtradeb-apt-source_0.4_all.deb -RUN dpkg -i xtradeb-apt-source_0.4_all.deb -RUN rm *.deb - -RUN apt-get update && \ - apt-get install -y \ - git \ - xvfb \ - curl \ - bzip2 \ - libgtk-3-dev \ - libdbus-glib-1-2 \ - wget \ - gnupg \ - firefox \ - firefox-geckodriver \ - chromium \ - chromium-driver \ - ca-certificates \ - gosu && \ - apt-get clean - -RUN useradd -u 1001 -m circleci - -WORKDIR /home/circleci - -ENV LANG=C.UTF-8 -ENV LC_ALL=C.UTF-8 - -# Set up Xvfb to start automatically -ENV DISPLAY=:99 - -ENV CI=true - -# Create an entrypoint script -COPY --chmod=755 docker-entrypoint.sh /docker-entrypoint.sh - -ENTRYPOINT ["/docker-entrypoint.sh"] -CMD ["bash"] diff --git a/build-in-docker.sh b/build-in-docker.sh index 1cbcb597..7d4f7af1 100755 --- a/build-in-docker.sh +++ b/build-in-docker.sh @@ -20,22 +20,16 @@ export WORKING_DIRECTORY=`pwd` export HOME_DIRECTORY=`echo ~` -export IMAGE="geb-build:latest" +export IMAGE_REPOSITORY="gebish/ci" +export IMAGE_TAG="v13" -# Remove existing container if it exists -docker rm -f geb-build-container 2>/dev/null || true +while getopts v: flag +do + case "${flag}" in + v) VERSION=${OPTARG};; + esac +done -# For podman on macOS, we need to use --privileged and --security-opt to access the host's podman socket -# The socket will be available via podman's automatic socket forwarding -# Use --network=host so testcontainers can access other containers via localhost -docker run -it \ - --name geb-build-container \ - --privileged \ - --network=host \ - --security-opt label=disable \ - -v /var/run/docker.sock:/var/run/docker.sock:Z \ - -v ${WORKING_DIRECTORY}:${WORKING_DIRECTORY} \ - -v ${HOME_DIRECTORY}/.gradle:/gradle-home \ - -w ${WORKING_DIRECTORY} \ - ${IMAGE} \ - "$@" \ No newline at end of file +export IMAGE="${IMAGE_REPOSITORY}:${IMAGE_TAG}" + +docker run -v ${WORKING_DIRECTORY}:${WORKING_DIRECTORY} -v ${HOME_DIRECTORY}/.gradle:/gradle-home -w ${WORKING_DIRECTORY} ${IMAGE} /bin/bash -c "Xvfb :99 -screen 1 1280x1024x16 -nolisten tcp > /dev/null 2>&1 & export DISPLAY=:99 ; ./gradlew --no-daemon --max-workers 4 --parallel $*" \ No newline at end of file diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh deleted file mode 100644 index 4d45b015..00000000 --- a/docker-entrypoint.sh +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash -# ---------------------------------------------------------------------------- -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# ---------------------------------------------------------------------------- - -# Check if Docker/Podman is available via the mounted socket -if [ -S /var/run/docker.sock ]; then - echo "Docker socket found at /var/run/docker.sock" -else - echo "ERROR: Docker socket not found at /var/run/docker.sock" - echo "Make sure the host Docker/Podman socket is mounted" - exit 1 -fi - -# Fix socket permissions to allow circleci user access -chmod 666 /var/run/docker.sock 2>/dev/null || true - -# Start Xvfb for headless browser testing -Xvfb :99 -screen 1 1280x1024x16 -nolisten tcp > /dev/null 2>&1 & - -# Drop to circleci user -exec gosu circleci "$@" \ No newline at end of file
