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

CI: Use Docker container from crops:yocto/opensuse-42-3 #221

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ def checkout_content(is_pr, pr_num) {

def build_docker_image(image_name) {
// Base container OS to use, see docker configs in docker/
def build_os = "opensuse-42.3"
def build_os = "crops-yocto-opensuse-42-3"
def build_args = [ build_proxy_args(), build_user_args()].join(" ")
sh "docker build -t ${image_name} ${build_args} docker/${build_os}"
dockerFingerprintFrom dockerfile: "docker/${build_os}/Dockerfile", image: "${image_name}"
Expand Down
26 changes: 26 additions & 0 deletions docker/crops-yocto-opensuse-42-3/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
FROM crops/yocto:opensuse-42.3-base

# non-default docker proxy vars
ARG ALL_PROXY
ARG socks_proxy
ARG SOCKS_PROXY

ENV JENKINS_HOME /var/lib/jenkins

ARG user=jenkins
ARG group=jenkins
ARG uid=1000
ARG gid=1000

USER root

RUN zypper --no-color --non-interactive install --no-recommends \
python3-unittest-xml-reporting python3-six

RUN groupadd -o -g ${gid} ${group} \
&& useradd -d "$JENKINS_HOME" -u ${uid} -g ${gid} -m -s /bin/bash ${user}

# VOLUME ${JENKINS_HOME}

USER jenkins
WORKDIR ${JENKINS_HOME}
2 changes: 1 addition & 1 deletion docker/local-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ fi
CURRENT_PROJECT=refkit
BUILD_DIR=${BUILD_DIR:-${WORKSPACE}/build}
BUILD_CACHE_DIR=$BUILD_DIR/bb-cache
BUILDOS="opensuse-42.3"
BUILDOS="crops-yocto-opensuse-42-3"
GIT_PROXY_COMMAND=oe-git-proxy
TARGET_MACHINE="intel-corei7-64"

Expand Down