File tree Expand file tree Collapse file tree 4 files changed +16
-14
lines changed Expand file tree Collapse file tree 4 files changed +16
-14
lines changed Original file line number Diff line number Diff line change 1
1
#! /usr/bin/env bash
2
- DOCKER_REGISTRY=mobile-studio--docker.eu-west-1.artifactory.aws.arm.com
2
+ ARTIFACTORY_URL=eu-west-1.artifactory.aws.arm.com
3
+ DOCKER_REGISTRY=mobile-studio--docker.${ARTIFACTORY_URL}
3
4
IMAGE_NAME=astcenc
4
- IMAGE_VERSION=3.0 .0
5
+ IMAGE_VERSION=3.1 .0
5
6
6
7
# Check Artifactory credentials are set
7
8
if [[ -z " ${ARTIFACTORY_CREDENTIALS} " ]]
@@ -17,11 +18,8 @@ rm -fr tmp
17
18
mkdir -p tmp
18
19
19
20
echo " Get static analysis tools"
20
- curl --user ${ARTIFACTORY_CREDENTIALS} https://eu-west-1.artifactory.aws.arm.com/artifactory/mobile-studio.tools/coverity201909.tar.xz --output tmp/coverity.tar.xz
21
- pushd tmp
22
- tar xf coverity.tar.xz
23
- rm coverity.tar.xz
24
- popd
21
+ curl --user ${ARTIFACTORY_CREDENTIALS} https://${ARTIFACTORY_URL} /artifactory/mobile-studio.tools/coverity/cov-analysis-linux64-2020.12.sh --output tmp/coverity_install.sh
22
+ curl --user ${ARTIFACTORY_CREDENTIALS} https://${ARTIFACTORY_URL} /artifactory/mobile-studio.tools/coverity/license.dat --output tmp/coverity_license.dat
25
23
26
24
echo " Building image"
27
25
docker build -f jenkins/build.Dockerfile \
Original file line number Diff line number Diff line change @@ -2,7 +2,8 @@ FROM ubuntu:18.04
2
2
3
3
RUN useradd -u 1000 -U -m -c Jenkins jenkins
4
4
5
- RUN apt update && apt-get install -y \
5
+ RUN apt update && apt -y upgrade \
6
+ && apt install -y \
6
7
software-properties-common \
7
8
clang \
8
9
clang++-9 \
@@ -18,15 +19,18 @@ RUN apt update && apt-get install -y \
18
19
python3-pil \
19
20
ca-certificates \
20
21
gnupg \
21
- wget
22
+ wget \
23
+ && rm -rf /var/lib/apt/lists/*
22
24
23
25
# Install python modules
24
26
RUN pip3 install requests
25
27
26
28
# Install Coverity static analysis tools
27
- COPY cov-analysis-linux64-2019.09 /coverity/
28
- RUN chmod -R a+rw /coverity
29
- ENV PATH="/coverity/bin:$PATH"
29
+ COPY coverity_* /tmp/
30
+ RUN chmod 555 /tmp/coverity_install.sh && \
31
+ /tmp/coverity_install.sh -q --license.region=6 --license.agreement=agree --license.cov.path=/tmp/coverity_license.dat -dir /usr/local/cov-analysis && \
32
+ rm /tmp/coverity_*
33
+ ENV PATH="/usr/local/cov-analysis/bin:$PATH"
30
34
31
35
# Install up-to-date CMake, as standard Ubuntu 18.04 package is too old
32
36
RUN wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null \
Original file line number Diff line number Diff line change @@ -41,7 +41,7 @@ pipeline {
41
41
- name: artifactory-ms-docker
42
42
containers:
43
43
- name: astcenc
44
- image: mobile-studio--docker.eu-west-1.artifactory.aws.arm.com/astcenc:3.0 .0
44
+ image: mobile-studio--docker.eu-west-1.artifactory.aws.arm.com/astcenc:3.1 .0
45
45
command:
46
46
- sleep
47
47
args:
Original file line number Diff line number Diff line change 43
43
- name: artifactory-ms-docker
44
44
containers:
45
45
- name: astcenc
46
- image: mobile-studio--docker.eu-west-1.artifactory.aws.arm.com/astcenc:3.0 .0
46
+ image: mobile-studio--docker.eu-west-1.artifactory.aws.arm.com/astcenc:3.1 .0
47
47
command:
48
48
- sleep
49
49
args:
You can’t perform that action at this time.
0 commit comments