diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ea6946f2e9b600a28c40b59c832363b6888d514d..ab6fc74ffb410c7d8037dbd7dbe510d908ea6a2e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: gitlab.fit.cvut.cz:5000/ict/alpine-docker-images/ci:3.8 +image: gitlab.fit.cvut.cz:5000/ict/alpine-docker-images/ci:3.9 stages: - deploy @@ -37,9 +37,3 @@ stages: deploy:osc: <<: *push-only-job - -deploy:alib-build: - <<: *job - -deploy:alib-test: - <<: *job diff --git a/alib-build/Dockerfile b/alib-build/Dockerfile deleted file mode 100644 index 548580a2daccd6a2dc066179728231db58e9c1d1..0000000000000000000000000000000000000000 --- a/alib-build/Dockerfile +++ /dev/null @@ -1,6 +0,0 @@ -FROM amd64/debian:testing-slim - -RUN apt-get update -y \ - && apt-get upgrade -y \ - && apt-get install -y build-essential cmake make python3 libcppunit-dev libxml2-dev libtclap-dev libreadline-dev qtbase5-dev graphviz-dev libjsoncpp-dev clang-7 \ - && apt-get clean -y diff --git a/alib-test/Dockerfile b/alib-test/Dockerfile deleted file mode 100644 index 296af2dc241ad73ad9706134967ffe4c70603771..0000000000000000000000000000000000000000 --- a/alib-test/Dockerfile +++ /dev/null @@ -1,6 +0,0 @@ -FROM amd64/debian:testing-slim - -RUN apt-get update -y \ - && apt-get upgrade -y \ - && apt-get install -y build-essential bash bc coreutils cmake make python3 libcppunit-1.14 libxml2 libreadline7 libqt5widgets5 libqt5xml5 graphviz libjsoncpp1 \ - && apt-get clean -y diff --git a/osc/Dockerfile b/osc/Dockerfile index 431cb08969e3e6658feea2696ee60c2f4b6dc839..a400d200efbc39efba977e26000edb6d0ff91576 100644 --- a/osc/Dockerfile +++ b/osc/Dockerfile @@ -6,4 +6,4 @@ RUN apk add \ RUN pip install wheel six RUN pip install build-service-osc pycurl RUN ln -s /usr/bin/osc-wrapper.py /usr/bin/osc -RUN apk del g++ curl-dev swig python3-dev +RUN apk del g++ curl-dev swig python-dev