From b7743ec796e5fe1afa460a09c5cd34cf7622cd81 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Thu, 7 Jan 2021 10:56:28 +0100 Subject: [PATCH] Move java-build image to separate repository --- build/Dockerfile | 70 ----------------------------------------------- build/Makefile | 9 ------ build/README.md | 3 -- build/modprobe.sh | 44 ----------------------------- 4 files changed, 126 deletions(-) delete mode 100644 build/Dockerfile delete mode 100644 build/Makefile delete mode 100644 build/README.md delete mode 100755 build/modprobe.sh diff --git a/build/Dockerfile b/build/Dockerfile deleted file mode 100644 index b5b2585c2b..0000000000 --- a/build/Dockerfile +++ /dev/null @@ -1,70 +0,0 @@ -# -# MIT License -# -# Copyright (c) 2020-present Cloudogu GmbH and Contributors -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in all -# copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -# SOFTWARE. -# - -FROM adoptopenjdk/openjdk11:x86_64-debian-jdk-11.0.9_11.1 - -ENV DOCKER_VERSION=19.03.8 \ - DOCKER_CHANNEL=stable \ - DOCKER_CHECKSUM=7f4115dc6a3c19c917f8b9664d7b51c904def1c984e082c4600097433323cf6f - -# fake modprobe -COPY modprobe.sh /usr/local/bin/modprobe - -# install required packages -RUN set -eux; \ - apt-get update \ - && apt-get install --no-install-recommends -y \ - # mercurial is requried for integration tests of the scm-hg-plugin - mercurial \ - # git is required by yarn install of scm-ui - git \ - # the following dependencies are required for cypress tests and are copied from - # https://github.com/cypress-io/cypress-docker-images/blob/master/base/12.18.3/Dockerfile - libgtk2.0-0 \ - libgtk-3-0 \ - libnotify-dev \ - libgconf-2-4 \ - libgbm-dev \ - libnss3 \ - libxss1 \ - libasound2 \ - libxtst6 \ - xauth \ - xvfb \ - # download docker - && curl -o docker-${DOCKER_VERSION}.tgz https://download.docker.com/linux/static/${DOCKER_CHANNEL}/x86_64/docker-${DOCKER_VERSION}.tgz \ - && echo "${DOCKER_CHECKSUM} docker-${DOCKER_VERSION}.tgz" > docker-${DOCKER_VERSION}.sha256sum \ - && sha256sum -c docker-${DOCKER_VERSION}.sha256sum \ - # extract docker and install it to /usr/local/bin - && tar --extract \ - --file docker-${DOCKER_VERSION}.tgz \ - --strip-components 1 \ - --directory /usr/local/bin/ \ - # verify docker installation - && docker --version \ - # remove temporary files - && rm -f docker-${DOCKER_VERSION}.tgz docker-${DOCKER_VERSION}.sha256sum \ - # clear apt caching - && apt-get clean \ - && rm -rf /var/lib/apt/lists/* diff --git a/build/Makefile b/build/Makefile deleted file mode 100644 index 8aa8cefc1d..0000000000 --- a/build/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -VERSION:=11.0.9_11.1 - -.PHONY:build -build: - docker build -t scmmanager/java-build:${VERSION} . - -.PHONY:publish -publish: build - docker push scmmanager/java-build:${VERSION} diff --git a/build/README.md b/build/README.md deleted file mode 100644 index 04aac49c1e..0000000000 --- a/build/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# Build tools - -This folder contains tools required to build scm-manager diff --git a/build/modprobe.sh b/build/modprobe.sh deleted file mode 100755 index bf7b8e36f9..0000000000 --- a/build/modprobe.sh +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/sh -# -# MIT License -# -# Copyright (c) 2020-present Cloudogu GmbH and Contributors -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in all -# copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -# SOFTWARE. -# - -set -eu - -# "modprobe" without modprobe -# https://twitter.com/lucabruno/status/902934379835662336 - -# this isn't 100% fool-proof, but it'll have a much higher success rate than simply using the "real" modprobe - -# Docker often uses "modprobe -va foo bar baz" -# so we ignore modules that start with "-" -for module; do - if [ "${module#-}" = "$module" ]; then - ip link show "$module" || true - lsmod | grep "$module" || true - fi -done - -# remove /usr/local/... from PATH so we can exec the real modprobe as a last resort -export PATH='/usr/sbin:/usr/bin:/sbin:/bin' -exec modprobe "$@"