jenspots/vieter
1
0
Fork 0
forked from vieter-v/vieter
Code Issues Pull requests Releases Activity

feat(docker): partially migrate to new code

Browse source
This commit is contained in:
Jef Roosens 2022-05-13 22:03:06 +02:00
parent dd9958ea28
commit 4c97489f8a
Signed by untrusted user: Jef Roosens
GPG key ID: B75D4F293C7052DB
4 changed files with 62 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/build/build.v
View file

@ -17,6 +17,8 @@ const build_image_repo = 'vieter-build'
// makepkg with. The base image should be some Linux distribution that uses
// Pacman as its package manager.
pub fn create_build_image(base_image string) ?string {
mut dd := docker.new_conn() ?
commands := [
// Update repos & install required packages
'pacman -Syu --needed --noconfirm base-devel git'
@ -48,12 +50,13 @@ pub fn create_build_image(base_image string) ?string {
// We pull the provided image
docker.pull_image(image_name, image_tag)?
id := docker.create_container(c)?
docker.start_container(id)?
id := dd.create_container(c)?.id
/* id := docker.create_container(c)? */
dd.start_container(id)?
// This loop waits until the container has stopped, so we can remove it after
for {
data := docker.inspect_container(id)?
data := dd.inspect_container(id)?
if !data.state.running {
break
@ -68,7 +71,7 @@ pub fn create_build_image(base_image string) ?string {
// conflicts.
tag := time.sys_mono_now().str()
image := docker.create_image_from_container(id, 'vieter-build', tag)?
docker.remove_container(id)?
dd.remove_container(id)?
return image.id
}