valitydev/image-riak-base
14
0
Fork 0
mirror of https://github.com/valitydev/image-riak-base.git synced 2024-11-06 02:05:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add od applet and /var/run -> /run symlink (#6)

Browse Source
This commit is contained in:
niku64 2019-03-21 13:04:05 +03:00 committed by GitHub
parent 449d456df2
commit 5b03665c38
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
Jenkinsfile vendored
View File

@ -1,37 +1,21 @@
#!groovy
// -*- mode: groovy -*-
build("image-embedded", 'docker-host') {
checkoutRepo()
withCredentials(
[[$class: 'FileBinding', credentialsId: 'github-rbkmoney-ci-bot-file', variable: 'GITHUB_PRIVKEY'],
[$class: 'FileBinding', credentialsId: 'bakka-su-rbkmoney-all', variable: 'BAKKA_SU_PRIVKEY']]) {
runStage('submodules') {
sh 'make submodules'
}
runStage('shared repositories update') {
sh 'make repos'
}
}
runStage('embedded-base image build') {
docker.withRegistry('https://dr2.rbkmoney.com/v2/', 'jenkins_harbor') {
sh 'make'
}
}
withGithubSshCredentials {
runStage('submodules') { sh 'make submodules' }
withCredentials(
[[$class: 'FileBinding', credentialsId: 'bakka-su-rbkmoney-all', variable: 'BAKKA_SU_PRIVKEY']]) {
runStage('repos') { sh 'make repos' }}}
try {
runStage('smoke test') {
sh 'make test'
}
if (env.BRANCH_NAME == 'master') {
runStage('docker image push') {
docker.withRegistry('https://dr2.rbkmoney.com/v2/', 'jenkins_harbor') {
sh 'make push'
}
docker.withRegistry('https://dr2.rbkmoney.com/v2/', 'jenkins_harbor') {
runStage('build image') { sh 'make' }
runStage('test image') { sh 'make test' }
if (env.BRANCH_NAME == 'master') {
runStage('docker image push') { sh 'make push' }
}
}
} finally {
runStage('rm local image') {
sh 'make clean'
}
runStage('Clean up') { sh 'make clean' }
}
}

3
files/install.sh
View File

@ -7,7 +7,7 @@ source /etc/portage/make.conf
GCC_LDPATH="$(gcc-config -L)"
mkdir -p "${DEST}"/{etc,run}/
mkdir -p "${DEST}"/{etc,run,var}/
echo 'Europe/Moscow' > "${DEST}"/etc/timezone
export ROOT="${DEST}"
@ -18,6 +18,7 @@ emerge -t sys-libs/zlib dev-libs/openssl net-libs/libmnl dev-libs/elfutils \
equery s \*
# Link logger to busybox to avoid installing util-linux
ln -s /bin/busybox "${DEST}/usr/bin/logger"
ln -s /run /var/run
mkdir -p "$(dirname "${DEST}${GCC_LDPATH}")"
cp -r "${GCC_LDPATH}" "${DEST}${GCC_LDPATH}"

2
files/portage/savedconfig/sys-apps/busybox
View File

@ -272,7 +272,7 @@ CONFIG_NICE=y
CONFIG_NL=y
CONFIG_NOHUP=y
# CONFIG_NPROC is not set
# CONFIG_OD is not set
CONFIG_OD=y
# CONFIG_PASTE is not set
CONFIG_PRINTENV=y
CONFIG_PRINTF=y