Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Tim-Philipp Müller
gst-ci
Commits
68a71431
Commit
68a71431
authored
Nov 22, 2018
by
Xavier Claessens
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Build Ubuntu base image
parent
af66e261
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
33 additions
and
12 deletions
+33
-12
.gitlab-ci.yml
.gitlab-ci.yml
+21
-1
docker/build-base-images/Dockerfile-ubuntu
docker/build-base-images/Dockerfile-ubuntu
+1
-1
gitlab/ci_template.yml
gitlab/ci_template.yml
+11
-10
No files found.
.gitlab-ci.yml
View file @
68a71431
...
...
@@ -105,6 +105,18 @@ ubuntu amd64 run docker:
changes
:
-
'
docker/runtime-images/Dockerfile-ubuntu'
ubuntu amd64 build docker
:
stage
:
"
build
base"
variables
:
ARCH
:
"
amd64"
TAG
:
"
ubuntu-build"
CONTEXT_DIR
:
"
docker/build-base-images/"
DOCKERFILE
:
"
docker/build-base-images/Dockerfile-ubuntu"
extends
:
.base
only
:
changes
:
-
'
docker/build-base-images/Dockerfile-ubuntu'
include
:
"
gitlab/ci_template.yml"
# Test the build job against the latest build image tag and the local manifest
...
...
@@ -112,4 +124,12 @@ build fedora x86_64 local:
extends
:
'
.build'
image
:
"
${CI_REGISTRY_IMAGE}/amd64/fedora-build:latest"
dependencies
:
-
'
manifest'
\ No newline at end of file
-
'
manifest'
build ubuntu x86_64 local
:
extends
:
'
.build'
variables
:
MESON_ARGS
:
"
${DEFAULT_MESON_ARGS}
-Dlibav=disabled"
image
:
"
${CI_REGISTRY_IMAGE}/amd64/ubuntu-build:latest"
dependencies
:
-
'
manifest'
docker/build-base-images/Dockerfile-ubuntu
View file @
68a71431
FROM registry.freedesktop.org/gstreamer/gst-ci/ubuntu-runtime
FROM registry.freedesktop.org/gstreamer/gst-ci/
amd64/
ubuntu-runtime
# make source packages available in order to figure out build dependencies
RUN \
...
...
gitlab/ci_template.yml
View file @
68a71431
...
...
@@ -4,6 +4,16 @@ stages:
variables
:
GIT_STRATEGY
:
none
DEFAULT_MESON_ARGS
:
>
-Dpython=enabled
-Dlibav=enabled
-Dugly=enabled
-Dbad=enabled
-Ddevtools=enabled
-Dges=enabled
-Drtsp_server=enabled
-Dvaapi=enabled
-Dsharp=disabled
manifest
:
image
:
'
registry.freedesktop.org/gstreamer/gst-ci/amd64/alpine-manifest-build:10ffa6f1af6fed20a8857d2c7426d81cf162e3d1'
...
...
@@ -26,16 +36,7 @@ manifest:
CCACHE_BASEDIR
:
"
${CI_PROJECT_DIR}"
CCACHE_DIR
:
"
${CI_PROJECT_DIR}/ccache"
MAIN_DIR
:
"
${CI_PROJECT_DIR}"
MESON_ARGS
:
>
-Dpython=enabled
-Dlibav=enabled
-Dugly=enabled
-Dbad=enabled
-Ddevtools=enabled
-Dges=enabled
-Drtsp_server=enabled
-Dvaapi=enabled
-Dsharp=disabled
MESON_ARGS
:
"
${DEFAULT_MESON_ARGS}"
script
:
# Not sure why, but permission errors else
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment