From 96e5c945883fdb5af4088e0cfde2dcdbf1be8846 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Wed, 18 Mar 2020 21:58:04 +0100 Subject: [PATCH] Use OpenLoco's docker images --- .travis.yml | 2 +- docker-compose.yml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index f4d9a269..2938c6ee 100644 --- a/.travis.yml +++ b/.travis.yml @@ -78,7 +78,7 @@ matrix: script: - mkdir build - - docker run -v $(pwd):/openloco -w /openloco/build -i -t openrct2/openloco:$DOCKERIMG bash -c "cmake ../ ${OPENLOCO_CMAKE_OPTS} && ninja -k0" + - docker run -v $(pwd):/openloco -w /openloco/build -i -t openloco/openloco:$DOCKERIMG bash -c "cmake ../ ${OPENLOCO_CMAKE_OPTS} && ninja -k0" deploy: provider: releases diff --git a/docker-compose.yml b/docker-compose.yml index bb55db57..9d9477d6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,21 +1,21 @@ version: '2' services: openloco-gcc32: - image: openrct2/openloco:ubuntu-i686 + image: openloco/openloco:ubuntu-i686 working_dir: /openloco/bin.gcc volumes: - .:/openloco entrypoint: bash command: -c "cmake ../ -G Ninja -DCMAKE_BUILD_TYPE=release && ninja -k0" openloco-clang32: - image: openrct2/openloco:ubuntu-i686 + image: openloco/openloco:ubuntu-i686 working_dir: /openloco/bin.clang volumes: - .:/openloco entrypoint: bash command: -c "cmake ../ -G Ninja -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_BUILD_TYPE=release && ninja -k0" openloco-mingw32: - image: openrct2/openloco:fedora-mingw32 + image: openloco/openloco:fedora-mingw32 working_dir: /openloco/bin.mingw32 volumes: - .:/openloco