You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by se...@apache.org on 2020/04/18 15:52:08 UTC
[directory-buildtools] branch master updated: Cleanup old
dockerfiles
This is an automated email from the ASF dual-hosted git repository.
seelmann pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/directory-buildtools.git
The following commit(s) were added to refs/heads/master by this push:
new e7dd163 Cleanup old dockerfiles
e7dd163 is described below
commit e7dd163cd2d65ee8cc950623838b2352993389d6
Author: Stefan Seelmann <ma...@stefan-seelmann.de>
AuthorDate: Sat Apr 18 17:49:30 2020 +0200
Cleanup old dockerfiles
---
docker/studio-build/Dockerfile | 47 ----------------
docker/studio-build/README.md | 68 -----------------------
docker/studio-build/build-studio-with-ui-tests.sh | 17 ------
docker/studio-build/entrypoint.sh | 11 ----
docker/studio-build/krb5.conf | 8 ---
docker/xvfb/Dockerfile | 27 ---------
docker/xvfb/README.md | 49 ----------------
7 files changed, 227 deletions(-)
diff --git a/docker/studio-build/Dockerfile b/docker/studio-build/Dockerfile
deleted file mode 100644
index 07c4212..0000000
--- a/docker/studio-build/Dockerfile
+++ /dev/null
@@ -1,47 +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.
-#
-
-ARG JDK_VERSION=8
-FROM maven:3-jdk-${JDK_VERSION}
-
-ENV DEBIAN_FRONTEND=noninteractive
-RUN apt-get update
-RUN apt-get install -y --no-install-recommends xvfb
-RUN apt-get install -y --no-install-recommends krb5-config krb5-user
-
-# Create home directory
-RUN mkdir -p /home/hnelson/studio && chmod 777 /home/hnelson && chmod 777 /home/hnelson/studio
-WORKDIR /home/hnelson/studio
-
-# Add krb5.conf with EXAMPLE.COM domain
-ADD krb5.conf /etc/
-
-# Make /etc/passwd writeable to be able to inject username with dynamic uid/gid
-RUN chmod 666 /etc/passwd
-
-# Add and configure entrypoint script
-ADD entrypoint.sh /usr/local/bin
-RUN chmod 755 /usr/local/bin/entrypoint.sh
-ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
-
-# Add build script and make it the default command
-ADD build-studio-with-ui-tests.sh /usr/local/bin
-RUN chmod 755 /usr/local/bin/build-studio-with-ui-tests.sh
-CMD "/usr/local/bin/build-studio-with-ui-tests.sh"
-
diff --git a/docker/studio-build/README.md b/docker/studio-build/README.md
deleted file mode 100644
index 94b3120..0000000
--- a/docker/studio-build/README.md
+++ /dev/null
@@ -1,68 +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.
-
-
-# About
-
-A docker image to run Apache Directory Studio build included full test suite within a docker container.
-
-It contains all requirements:
-* OpenJDK 8 or 11
-* Maven 3.6
-* Xvfb (for running UI tests)
-* LDAP client
-* Kerberos client
-
-
-## Build image
-
-See <https://hub.docker.com/_/maven> for available Maven base image tags.
-
- JDK_VERSION=8
- docker pull maven:3-jdk-${JDK_VERSION}
- docker build -t apachedirectory/studio-build:jdk-${JDK_VERSION} --build-arg JDK_VERSION=${JDK_VERSION} .
-
-
-## Publish image
-
- docker push apachedirectory/studio-build:jdk-${JDK_VERSION}
-
-
-## Usage
-
-Local:
-
- docker run -it --rm \
- -u $(id -u):$(id -g) \
- -v ~/.m2:/home/hnelson/.m2 \
- -v $(pwd):/home/hnelson/studio \
- apachedirectory/studio-build:jdk-8 bash
-
- cd /home/hnelson/studio
- mvn -f pom-first.xml clean install
- mvn clean install -Denable-ui-tests
-
-
-On Jenkins:
-
- docker run -i --rm \
- -u $(id -u):$(id -g) \
- -v ~/.m2:/home/hnelson/.m2 \
- -v $(pwd):/home/hnelson/studio \
- apachedirectory/studio-build:jdk-8
-
-
diff --git a/docker/studio-build/build-studio-with-ui-tests.sh b/docker/studio-build/build-studio-with-ui-tests.sh
deleted file mode 100755
index 4a30818..0000000
--- a/docker/studio-build/build-studio-with-ui-tests.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-# stop execution if any command fails (i.e. exits with status code > 0)
-set -e
-
-# trace commands
-set -x
-
-# Temporary workaround with Surefire on Debian with Java 8 and limit memory usage
-# https://issues.apache.org/jira/browse/SUREFIRE-1588
-# https://stackoverflow.com/questions/53010200/maven-surefire-could-not-find-forkedbooter-class
-export MAVEN_OPTS="-Xmx1024m"
-export _JAVA_OPTIONS="-Djdk.net.URLClassPath.disableClassPathURLCheck=true -Xmx1024m"
-
-mvn -V -f pom-first.xml clean install
-mvn -V clean install -Denable-ui-tests
-
diff --git a/docker/studio-build/entrypoint.sh b/docker/studio-build/entrypoint.sh
deleted file mode 100755
index 731def1..0000000
--- a/docker/studio-build/entrypoint.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-set -e
-
-export DISPLAY=:99
-Xvfb :99 -screen 0 1024x768x16 &
-
-echo "hnelson:x:$(id -u):$(id -g)::/home/hnelson:/bin/bash" >> /etc/passwd
-export HOME=/home/hnelson
-
-exec "$@"
-
diff --git a/docker/studio-build/krb5.conf b/docker/studio-build/krb5.conf
deleted file mode 100644
index 096316a..0000000
--- a/docker/studio-build/krb5.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-[libdefaults]
- default_realm = EXAMPLE.COM
-
-[realms]
- EXAMPLE.COM = {
- kdc = localhost:60088
- }
-
diff --git a/docker/xvfb/Dockerfile b/docker/xvfb/Dockerfile
deleted file mode 100644
index 92ceaa8..0000000
--- a/docker/xvfb/Dockerfile
+++ /dev/null
@@ -1,27 +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 alpine
-
-RUN apk add --no-cache xvfb
-
-ENV DISPLAY :6
-
-CMD Xvfb $DISPLAY -ac -listen tcp -screen 0 1024x768x16
-
diff --git a/docker/xvfb/README.md b/docker/xvfb/README.md
deleted file mode 100644
index 8c9e476..0000000
--- a/docker/xvfb/README.md
+++ /dev/null
@@ -1,49 +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.
-
-
-# About
-
-A docker image to run Xvfb within a docker container and make an X11 server available to the host.
-
-Used to run Apache Directory Studio UI tests on Jenkins.
-
-
-## Build image
-
- docker build -t apachedirectory/xvfb .
-
-
-## Publish image
-
- docker push apachedirectory/xvfb
-
-
-## Usage
-
- CONTAINER_NAME="dir-studio-ui-tests-xvfb"
- for PORT in $(seq 6006 6099); do netstat -tln | grep $PORT || break; done
- echo "Using TCP port $PORT for Xvfb"
- export DISPLAY=:$((PORT-6000))
- echo "Using DISPLAY $DISPLAY"
- docker run -d --name $CONTAINER_NAME -e DISPLAY=$DISPLAY -p $PORT:$PORT apachedirectory/xvfb
- xdpyinfo -display $DISPLAY
- mvn clean install -Denable-ui-tests
- docker stop $CONTAINER_NAME
- docker rm $CONTAINER_NAME
-
-