diff options
author | Giacomo Pozzoni <giacomopoz@gmail.com> | 2021-04-25 16:10:47 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-04-25 16:10:47 +0200 |
commit | 5991dcb12b638a0ef483fddeeda3e5744012dda6 (patch) | |
tree | 308db7b0cad8d07805dc18399e69bb2d1d6470d7 | |
parent | 2f04c48919664524c0036fa5923ea082e45f435f (diff) |
CI/CircleCI: Switch to Ubuntu 21.04 (#26476)
-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 9c26490bbc2..b8435bf3de9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,7 +2,7 @@ version: 2 jobs: codestyle_and_sql: docker: - - image: trinitycore/circle-ci:3.3.5-buildpacks-focal + - image: trinitycore/circle-ci:3.3.5-buildpacks-hirsute auth: username: $DOCKERHUB_USERNAME password: $DOCKERHUB_PASSWORD @@ -38,7 +38,7 @@ jobs: cat sql/updates/world/3.3.5/*.sql | mysql -h 127.0.0.1 -uroot world pch: docker: - - image: trinitycore/circle-ci:3.3.5-buildpacks-focal + - image: trinitycore/circle-ci:3.3.5-buildpacks-hirsute auth: username: $DOCKERHUB_USERNAME password: $DOCKERHUB_PASSWORD @@ -97,7 +97,7 @@ jobs: path: docker.tar.gz nopch: docker: - - image: trinitycore/circle-ci:3.3.5-buildpacks-focal + - image: trinitycore/circle-ci:3.3.5-buildpacks-hirsute auth: username: $DOCKERHUB_USERNAME password: $DOCKERHUB_PASSWORD diff --git a/contrib/Docker/Dockerfile b/contrib/Docker/Dockerfile index e4392c5b3d0..c02d003c194 100644 --- a/contrib/Docker/Dockerfile +++ b/contrib/Docker/Dockerfile @@ -1,4 +1,4 @@ -FROM trinitycore/circle-ci:3.3.5-buildpacks-focal +FROM trinitycore/circle-ci:3.3.5-buildpacks-hirsute #Setup WORKDIR /home/circleci |