Skip to content

Commit

Permalink
set disroopartifacts3
Browse files Browse the repository at this point in the history
  • Loading branch information
Stefan Eicher committed Oct 31, 2023
1 parent fff8a73 commit 1b0cc38
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion config-build.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"remotes": [
{
"name": "disroop-conan",
"url": "https://disroopartifacts2.jfrog.io/artifactory/api/conan/disroop-conan",
"url": "https://disroopartifacts3.jfrog.io/artifactory/api/conan/disroop-conan",
"login": true,
"force": true
}
Expand Down
8 changes: 4 additions & 4 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
wget=1.20.3-1ubuntu1 \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/* \
&& wget --progress=dot:giga -qO- "https://disroopartifacts2.jfrog.io/artifactory/thirdparty-generic-local/cmake-3.21.4.tar.gz" | tar --strip-components=1 -xz -C /usr/local
&& wget --progress=dot:giga -qO- "https://disroopartifacts3.jfrog.io/artifactory/thirdparty-generic-local/cmake-3.21.4.tar.gz" | tar --strip-components=1 -xz -C /usr/local
#from https://github.com/Kitware/CMake/releases/download/v3.21.4/cmake-3.21.4.tar.gz

#################### sonar-scanner ####################
Expand All @@ -73,15 +73,15 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
# Sonar Build Wrapper
ARG BUILD_WRAPPER_HOME=/opt/build-wrapper-linux-x86
#from https://sonarcloud.io/static/cpp/build-wrapper-linux-x86.zip
RUN wget --progress=dot:giga -O /opt/build-wrapper-linux-x86.zip https://disroopartifacts2.jfrog.io/artifactory/thirdparty-generic-local/build-wrapper-linux-x86.zip \
RUN wget --progress=dot:giga -O /opt/build-wrapper-linux-x86.zip https://disroopartifacts3.jfrog.io/artifactory/thirdparty-generic-local/build-wrapper-linux-x86.zip \
&& unzip /opt/build-wrapper-linux-x86.zip -d /opt \
&& rm /opt/build-wrapper-linux-x86.zip
ENV BUILD_WRAPPER_HOME=${BUILD_WRAPPER_HOME} PATH=${BUILD_WRAPPER_HOME}:${PATH}
RUN ln -s ${BUILD_WRAPPER_HOME}/build-wrapper-linux-x86-64 ${BUILD_WRAPPER_HOME}/build-wrapper

# Sonar Scanner
#from https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-4.6.2.2472-linux.zip
RUN wget --progress=dot:giga -O /opt/sonar-scanner-cli.zip https://disroopartifacts2.jfrog.io/artifactory/thirdparty-generic-local/sonar-scanner-cli-4.6.2.2472-linux.zip\
RUN wget --progress=dot:giga -O /opt/sonar-scanner-cli.zip https://disroopartifacts3.jfrog.io/artifactory/thirdparty-generic-local/sonar-scanner-cli-4.6.2.2472-linux.zip\
&& unzip /opt/sonar-scanner-cli.zip -d /opt \
&& rm /opt/sonar-scanner-cli.zip

Expand Down Expand Up @@ -115,7 +115,7 @@ ARG TMP_JLINK_TGZ=/tmp
ARG TAR_NAME=JLink_Linux_x86_64.tgz
ARG FOLDER_JLINK=/opt/segger-jlink
#from https://www.segger.com/downloads/jlink/JLink_Linux_V750_x86_64.tgz
RUN wget --progress=dot:giga https://disroopartifacts2.jfrog.io/artifactory/thirdparty-generic-local/JLink_Linux_V750_x86_64.tgz --directory-prefix=$TMP_JLINK_TGZ \
RUN wget --progress=dot:giga https://disroopartifacts3.jfrog.io/artifactory/thirdparty-generic-local/JLink_Linux_V750_x86_64.tgz --directory-prefix=$TMP_JLINK_TGZ \
&& mkdir ${FOLDER_JLINK} && tar -xzvf $TMP_JLINK_TGZ/JLink_Linux_V750_x86_64.tgz -C ${FOLDER_JLINK} --strip 1 \
&& rm ${FOLDER_JLINK}/JLinkConfigExe \
&& rm ${FOLDER_JLINK}/JLinkGDBServerExe \
Expand Down
16 changes: 8 additions & 8 deletions docker/sources.list
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
deb https://disroopartifacts2.jfrog.io/artifactory/disroop-debian-remote/ focal main restricted
deb https://disroopartifacts3.jfrog.io/artifactory/disroop-debian-remote/ focal main restricted

deb https://disroopartifacts2.jfrog.io/artifactory/disroop-debian-remote/ focal-updates main restricted
deb https://disroopartifacts3.jfrog.io/artifactory/disroop-debian-remote/ focal-updates main restricted

deb https://disroopartifacts2.jfrog.io/artifactory/disroop-debian-remote/ focal universe
deb https://disroopartifacts2.jfrog.io/artifactory/disroop-debian-remote/ focal-updates universe
deb https://disroopartifacts3.jfrog.io/artifactory/disroop-debian-remote/ focal universe
deb https://disroopartifacts3.jfrog.io/artifactory/disroop-debian-remote/ focal-updates universe

deb https://disroopartifacts2.jfrog.io/artifactory/disroop-debian-remote/ focal multiverse
deb https://disroopartifacts3.jfrog.io/artifactory/disroop-debian-remote/ focal multiverse

deb https://disroopartifacts2.jfrog.io/artifactory/disroop-debian-remote/ focal-backports main restricted universe multiverse
deb https://disroopartifacts3.jfrog.io/artifactory/disroop-debian-remote/ focal-backports main restricted universe multiverse

deb https://disroopartifacts2.jfrog.io/artifactory/disroop-debian-security/ focal-security universe
deb https://disroopartifacts2.jfrog.io/artifactory/disroop-debian-security/ focal-security multiverse
deb https://disroopartifacts3.jfrog.io/artifactory/disroop-debian-security/ focal-security universe
deb https://disroopartifacts3.jfrog.io/artifactory/disroop-debian-security/ focal-security multiverse

0 comments on commit 1b0cc38

Please sign in to comment.