Skip to content
Snippets Groups Projects
Commit fcd8a552 authored by Marcel Huber's avatar Marcel Huber
Browse files

changed back to apt-get cli

parent fc2b0598
No related branches found
No related tags found
No related merge requests found
Pipeline #324472 canceled
...@@ -20,13 +20,12 @@ default: ...@@ -20,13 +20,12 @@ default:
Build: Build:
stage: build stage: build
variables:
LABEL_VERSION: "${CI_COMMIT_TAG:-$CI_COMMIT_REF_NAME}"
IMAGE_TAG: $CI_COMMIT_REF_SLUG
script: script:
- export LABEL_BUILD_DATE="$(date -u +"%Y-%m-%dT%H:%M:%SZ")" - export LABEL_BUILD_DATE="$(date -u +"%Y-%m-%dT%H:%M:%SZ")"
LABEL_VERSION="${CI_COMMIT_TAG:-$CI_COMMIT_REF_NAME}"
IMAGE_TAG=$CI_COMMIT_REF_SLUG
- . .env - . .env
- env
- set -x
- docker build --pull - docker build --pull
--build-arg BUILDKIT_INLINE_CACHE=1 --build-arg BUILDKIT_INLINE_CACHE=1
--cache-from $IMAGE_TAG_BUILD --cache-from $IMAGE_TAG_BUILD
......
...@@ -15,7 +15,7 @@ APT::Get::AutomaticRemove "true";\n\ ...@@ -15,7 +15,7 @@ APT::Get::AutomaticRemove "true";\n\
quiet;\n" > /etc/apt/apt.conf.d/coast-options quiet;\n" > /etc/apt/apt.conf.d/coast-options
RUN dpkg --add-architecture i386\ RUN dpkg --add-architecture i386\
&& apt update && apt install \ && apt-get update && apt-get install \
curl software-properties-common wget\ curl software-properties-common wget\
&& apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys BA9EF27F\ && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys BA9EF27F\
&& add-apt-repository --yes ppa:ubuntu-toolchain-r/test\ && add-apt-repository --yes ppa:ubuntu-toolchain-r/test\
...@@ -23,20 +23,20 @@ RUN dpkg --add-architecture i386\ ...@@ -23,20 +23,20 @@ RUN dpkg --add-architecture i386\
&& add-apt-repository --yes ppa:martin-frost/thoughtbot-rcm\ && add-apt-repository --yes ppa:martin-frost/thoughtbot-rcm\
&& curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash\ && curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash\
&& curl -sL https://deb.nodesource.com/setup_14.x | bash\ && curl -sL https://deb.nodesource.com/setup_14.x | bash\
&& apt update && apt install\ && apt-get update && apt-get install\
file git git-lfs gosu iproute2 less nodejs shared-mime-info sudo tig tzdata vim doxygen xz-utils tree direnv\ file git git-lfs gosu iproute2 less nodejs shared-mime-info sudo tig tzdata vim doxygen xz-utils tree direnv\
graphviz fonts-liberation ranger rcm openssh-client man bash-completion\ graphviz fonts-liberation ranger rcm openssh-client man bash-completion\
&& apt purge software-properties-common; apt autoremove; apt autoclean; apt clean; rm -rf /var/lib/apt/lists/* && apt-get purge software-properties-common; apt-get autoremove; apt-get autoclean; apt-get clean; rm -rf /var/lib/apt/lists/*
RUN npm i --global diff-so-fancy bats RUN npm i --global diff-so-fancy bats
RUN ln -sf /usr/share/zoneinfo/Europe/Zurich /etc/localtime && rm /etc/timezone RUN ln -sf /usr/share/zoneinfo/Europe/Zurich /etc/localtime && rm /etc/timezone
RUN apt update && apt install\ RUN apt-get update && apt-get install\
python-pip python-virtualenv python-all-dev virtualenv python-setuptools python-wheel tox\ python-pip python-virtualenv python-all-dev virtualenv python-setuptools python-wheel tox\
g++-multilib g++-4.4-multilib g++-4.6-multilib g++-4.7-multilib g++-4.8-multilib g++-5-multilib g++-9-multilib gdb gdbserver\ g++-multilib g++-4.4-multilib g++-4.6-multilib g++-4.7-multilib g++-4.8-multilib g++-5-multilib g++-9-multilib gdb gdbserver\
libssl-dev libssl-dev:i386 libldap2-dev libsasl2-dev libaio1 libaio1:i386\ libssl-dev libssl-dev:i386 libldap2-dev libsasl2-dev libaio1 libaio1:i386\
&& apt autoremove; apt autoclean; apt clean; rm -rf /var/lib/apt/lists/* && apt-get autoremove; apt-get autoclean; apt-get clean; rm -rf /var/lib/apt/lists/*
# setup gcc alternatives # setup gcc alternatives
RUN for n in 4.4 4.6 4.7 4.8 5 9; do\ RUN for n in 4.4 4.6 4.7 4.8 5 9; do\
...@@ -55,10 +55,10 @@ deb-src http://apt.llvm.org/xenial/ llvm-toolchain-xenial-11 main\n\ ...@@ -55,10 +55,10 @@ deb-src http://apt.llvm.org/xenial/ llvm-toolchain-xenial-11 main\n\
" > /etc/apt/sources.list.d/apt.llvm.org.list\ " > /etc/apt/sources.list.d/apt.llvm.org.list\
&& curl -sSL https://apt.llvm.org/llvm-snapshot.gpg.key| apt-key add - && curl -sSL https://apt.llvm.org/llvm-snapshot.gpg.key| apt-key add -
RUN apt update && apt install\ RUN apt-get update && apt-get install\
lldb-12 llvm-dev clang-modernize-3.7 clang clang-format\ lldb-12 llvm-dev clang-modernize-3.7 clang clang-format\
&& clang-format --version\ && clang-format --version\
&& apt autoremove; apt autoclean; apt clean; rm -rf /var/lib/apt/lists/* && apt-get autoremove; apt-get autoclean; apt-get clean; rm -rf /var/lib/apt/lists/*
ENV USER=docky\ ENV USER=docky\
EDITOR=vim\ EDITOR=vim\
......
...@@ -3,13 +3,13 @@ FROM $CEVELOP_FROM_IMAGE ...@@ -3,13 +3,13 @@ FROM $CEVELOP_FROM_IMAGE
ARG CEVELOP_FROM_IMAGE ARG CEVELOP_FROM_IMAGE
RUN echo "using from image [$CEVELOP_FROM_IMAGE]" RUN echo "using from image [$CEVELOP_FROM_IMAGE]"
RUN apt update && apt install\ RUN apt-get update && apt-get install\
software-properties-common\ software-properties-common\
&& add-apt-repository --yes ppa:openjdk-r/ppa\ && add-apt-repository --yes ppa:openjdk-r/ppa\
&& apt update && apt install\ && apt-get update && apt-get install\
openjdk-11-jre-headless java-common default-jre default-java-plugin libwebkitgtk-3.0-0\ openjdk-11-jre-headless java-common default-jre default-java-plugin libwebkitgtk-3.0-0\
fonts-dejavu-extra ttf-bitstream-vera evince\ fonts-dejavu-extra ttf-bitstream-vera evince\
&& apt purge software-properties-common; apt autoremove; apt autoclean; apt clean; rm -rf /var/lib/apt/lists/* && apt-get purge software-properties-common; apt-get autoremove; apt-get autoclean; apt-get clean; rm -rf /var/lib/apt/lists/*
ARG ECLIPSE_URL=https://www.cevelop.com/cevelop/downloads/cevelop-1.14.1-202002280945-linux.gtk.x86_64.tar.gz ARG ECLIPSE_URL=https://www.cevelop.com/cevelop/downloads/cevelop-1.14.1-202002280945-linux.gtk.x86_64.tar.gz
ENV WORKSPACE_DIR=/workspace\ ENV WORKSPACE_DIR=/workspace\
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment