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

Commit

Permalink
CI: Try to use Docker container from crops:yocto/ubuntu-16
Browse files Browse the repository at this point in the history
Signed-off-by: Olev Kartau <[email protected]>
  • Loading branch information
okartau committed Jul 8, 2017
1 parent 58e3343 commit 20e4dfb
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ def checkout_content(is_pr) {

def build_docker_image(image_name) {
// Base container OS to use, see docker configs in docker/
def build_os = "opensuse-42.2"
def build_os = "crops-yocto-ubuntu-16"
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
23 changes: 23 additions & 0 deletions docker/crops-yocto-ubuntu-16/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
FROM crops/yocto:ubuntu-16.04-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 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.2"
BUILDOS="crops-yocto-ubuntu-16"
GIT_PROXY_COMMAND=oe-git-proxy
TARGET_MACHINE="intel-corei7-64"

Expand Down

0 comments on commit 20e4dfb

Please sign in to comment.