From 023f847b067477a68ea4097e39078bc008473e92 Mon Sep 17 00:00:00 2001 From: Override-6 Date: Sun, 29 Jan 2023 18:05:46 +0100 Subject: [PATCH] fixing tests and drone --- drone/image/Dockerfile | 12 ------------ drone/image/tbasket-backend.dockerfile | 9 +++------ drone/image/tbasket-test.dockerfile | 11 ----------- tests/resources/generate_keys.sh | 0 4 files changed, 3 insertions(+), 29 deletions(-) delete mode 100644 drone/image/Dockerfile delete mode 100644 drone/image/tbasket-test.dockerfile create mode 100644 tests/resources/generate_keys.sh diff --git a/drone/image/Dockerfile b/drone/image/Dockerfile deleted file mode 100644 index 53609b4..0000000 --- a/drone/image/Dockerfile +++ /dev/null @@ -1,12 +0,0 @@ -FROM ubuntu:latest - -RUN apt update &&\ - apt install ca-certificates curl gnupg lsb-release -y && \ - mkdir -p /etc/apt/keyrings && \ - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg &&\ - echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu \ - $(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null; \ - apt update &&\ - apt install git docker-ce docker-ce-cli containerd.io docker-compose-plugin -y; - - diff --git a/drone/image/tbasket-backend.dockerfile b/drone/image/tbasket-backend.dockerfile index 79ab10e..6eacd8f 100644 --- a/drone/image/tbasket-backend.dockerfile +++ b/drone/image/tbasket-backend.dockerfile @@ -1,11 +1,8 @@ # syntax=override6/tbasket-end:latest FROM ubuntu:latest -RUN apt update &&\ - apt install openjdk-11-jdk openssh-client wget unzip curl -y &&\ - wget https://services.gradle.org/distributions/gradle-7.5.1-bin.zip &&\ - mkdir /opt/gradle &&\ - unzip -d /opt/gradle gradle-7.5.1-bin.zip &&\ - export GRADLE_HOME=/opt/gradle/gradle-7.5.1 +RUN apt update +RUN apt install openjdk-19-jdk -y +RUN apt install openssh-client -y diff --git a/drone/image/tbasket-test.dockerfile b/drone/image/tbasket-test.dockerfile deleted file mode 100644 index dd71726..0000000 --- a/drone/image/tbasket-test.dockerfile +++ /dev/null @@ -1,11 +0,0 @@ -# syntax=override6/tbasket-end:latest -FROM ubuntu:latest - -RUN apt update &&\ - apt install openjdk-11-jdk openssh-client wget unzip curl -y &&\ - wget https://services.gradle.org/distributions/gradle-7.5.1-bin.zip &&\ - mkdir /opt/gradle &&\ - unzip -d /opt/gradle gradle-7.5.1-bin.zip &&\ - export GRADLE_HOME=/opt/gradle/gradle-7.5.1 \ - - diff --git a/tests/resources/generate_keys.sh b/tests/resources/generate_keys.sh new file mode 100644 index 0000000..e69de29