Skip to content
This repository was archived by the owner on Aug 5, 2022. It is now read-only.

Commit 20e4dfb

Browse files
committed
CI: Try to use Docker container from crops:yocto/ubuntu-16
Signed-off-by: Olev Kartau <olev.kartau@intel.com>
1 parent 58e3343 commit 20e4dfb

3 files changed

Lines changed: 25 additions & 2 deletions

File tree

Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ def checkout_content(is_pr) {
258258

259259
def build_docker_image(image_name) {
260260
// Base container OS to use, see docker configs in docker/
261-
def build_os = "opensuse-42.2"
261+
def build_os = "crops-yocto-ubuntu-16"
262262
def build_args = [ build_proxy_args(), build_user_args()].join(" ")
263263
sh "docker build -t ${image_name} ${build_args} docker/${build_os}"
264264
dockerFingerprintFrom dockerfile: "docker/${build_os}/Dockerfile", image: "${image_name}"
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
FROM crops/yocto:ubuntu-16.04-base
2+
3+
# non-default docker proxy vars
4+
ARG ALL_PROXY
5+
ARG socks_proxy
6+
ARG SOCKS_PROXY
7+
8+
ENV JENKINS_HOME /var/lib/jenkins
9+
10+
ARG user=jenkins
11+
ARG group=jenkins
12+
ARG uid=1000
13+
ARG gid=1000
14+
15+
USER root
16+
17+
RUN groupadd -o -g ${gid} ${group} \
18+
&& useradd -d "$JENKINS_HOME" -u ${uid} -g ${gid} -m -s /bin/bash ${user}
19+
20+
# VOLUME ${JENKINS_HOME}
21+
22+
USER jenkins
23+
WORKDIR ${JENKINS_HOME}

docker/local-build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ fi
88
CURRENT_PROJECT=refkit
99
BUILD_DIR=${BUILD_DIR:-${WORKSPACE}/build}
1010
BUILD_CACHE_DIR=$BUILD_DIR/bb-cache
11-
BUILDOS="opensuse-42.2"
11+
BUILDOS="crops-yocto-ubuntu-16"
1212
GIT_PROXY_COMMAND=oe-git-proxy
1313
TARGET_MACHINE="intel-corei7-64"
1414

0 commit comments

Comments
 (0)