diff options
| author | Giacomo Pozzoni <giacomopoz@gmail.com> | 2021-04-25 16:10:47 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2022-03-09 12:22:32 +0100 |
| commit | 83ca66cd40d7912494ce9be3f64f8655dd64725a (patch) | |
| tree | f433c9b0adbbec0c5999048d62679d9b9c82cf34 | |
| parent | 673f7a53e5c3ae80dc95147fd870389bd8db8315 (diff) | |
CI/CircleCI: Switch to Ubuntu 21.04 (#26476)
(cherry picked from commit 5991dcb12b638a0ef483fddeeda3e5744012dda6)
| -rw-r--r-- | .circleci/config.yml | 6 | ||||
| -rw-r--r-- | contrib/Docker/Dockerfile | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index d22495f7501..9ba4be3c85c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,7 +2,7 @@ version: 2 jobs: codestyle_and_sql: docker: - - image: trinitycore/circle-ci:master-buildpacks-focal + - image: trinitycore/circle-ci:master-buildpacks-hirsute auth: username: $DOCKERHUB_USERNAME password: $DOCKERHUB_PASSWORD @@ -44,7 +44,7 @@ jobs: cat sql/updates/hotfixes/master/*.sql | mysql -h 127.0.0.1 -uroot hotfixes pch: docker: - - image: trinitycore/circle-ci:master-buildpacks-focal + - image: trinitycore/circle-ci:master-buildpacks-hirsute auth: username: $DOCKERHUB_USERNAME password: $DOCKERHUB_PASSWORD @@ -103,7 +103,7 @@ jobs: path: docker.tar.gz nopch: docker: - - image: trinitycore/circle-ci:master-buildpacks-focal + - image: trinitycore/circle-ci:master-buildpacks-hirsute auth: username: $DOCKERHUB_USERNAME password: $DOCKERHUB_PASSWORD diff --git a/contrib/Docker/Dockerfile b/contrib/Docker/Dockerfile index 7bbb306a9b4..7f6b8ed8d33 100644 --- a/contrib/Docker/Dockerfile +++ b/contrib/Docker/Dockerfile @@ -1,4 +1,4 @@ -FROM trinitycore/circle-ci:master-buildpacks-focal +FROM trinitycore/circle-ci:master-buildpacks-hirsute #Setup WORKDIR /home/circleci |