diff options
| author | Frantisek Sumsal <frantisek@sumsal.cz> | 2018-11-06 17:16:45 +0100 |
|---|---|---|
| committer | Frantisek Sumsal <frantisek@sumsal.cz> | 2018-11-06 17:16:45 +0100 |
| commit | 0d589dfceeec697cf0f73f195a5ceffcae79d89e (patch) | |
| tree | 387f98c928c8f2ab817f439aaa6a29f2e28bef80 /travis-ci | |
| parent | 059f31920eb9e60ad979622c78f52136acee7854 (diff) | |
| download | systemd-0d589dfceeec697cf0f73f195a5ceffcae79d89e.tar.gz | |
travis: drop the unnecessary /etc/machine-id magic
Diffstat (limited to 'travis-ci')
| -rwxr-xr-x | travis-ci/managers/fedora.sh | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/travis-ci/managers/fedora.sh b/travis-ci/managers/fedora.sh index f2295a4b83..21a5231cc9 100755 --- a/travis-ci/managers/fedora.sh +++ b/travis-ci/managers/fedora.sh @@ -4,8 +4,7 @@ # or set REPO_ROOT to a correct path. # # Example execution on Fedora: -# dnf config-manager --add-repo https://download.docker.com/linux/fedora/docker-ce.repo -# dnf install -y docker-ce +# dnf install docker # systemctl start docker # export CONT_NAME="my-fancy-container" # travis-ci/managers/fedora.sh SETUP RUN CLEANUP @@ -29,19 +28,15 @@ for phase in "${PHASES[@]}"; do SETUP) info "Setup phase" info "Using Fedora $FEDORA_RELEASE" - MACHINE_ID="/etc/machine-id" - if [ ! -f $MACHINE_ID ]; then - MACHINE_ID="/var/lib/dbus/machine-id" - fi # Pull a Docker image and start a new container docker pull fedora:$FEDORA_RELEASE info "Starting container $CONT_NAME" $DOCKER_RUN -v $REPO_ROOT:/build:rw \ - -v $MACHINE_ID:/etc/machine-id:ro \ -w /build --privileged=true --name $CONT_NAME \ -dit --net=host fedora:$FEDORA_RELEASE /sbin/init $DOCKER_EXEC dnf makecache # Install necessary build/test requirements + $DOCKER_EXEC dnf -y upgrade $DOCKER_EXEC dnf -y install "${ADDITIONAL_DEPS[@]}" $DOCKER_EXEC dnf -y builddep systemd ;; |