Commit graph

494 commits

Author SHA1 Message Date
Zeger-Jan van de Weg
dacd018515
Add Golang 1.13 for Gitaly 2019-10-04 10:42:00 +02:00
Rémy Coutable
e77f4d79fc Merge branch 'jerasmus-master-patch-33196' into 'master'
Fix node and yarn installation

See merge request gitlab-org/gitlab-build-images!229
2019-10-02 10:07:40 +00:00
Jacques Erasmus
55d7b086a5 Fix node and yarn installation 2019-10-02 10:07:40 +00:00
Rémy Coutable
1930412f24 Merge branch 'fix-gitlab-docs-image' into 'master'
Fix the gitlab-docs image by properly basing it on 'ruby:2.6.3-alpine-3.10'

See merge request gitlab-org/gitlab-build-images!228
2019-10-01 16:37:45 +00:00
Rémy Coutable
946c2425f9
Fix the gitlab-docs image by properly basing it on 'ruby:2.6.3-alpine-3.10'
Signed-off-by: Rémy Coutable <remy@rymai.me>
2019-10-01 17:57:55 +02:00
Rémy Coutable
c72346c51d Merge branch 'jerasmus-add-docs-image' into 'master'
Add image for gitlab-docs

See merge request gitlab-org/gitlab-build-images!227
2019-09-30 09:05:48 +00:00
Jacques Erasmus
9a3351c558 Add image for gitlab-docs 2019-09-30 09:05:48 +00:00
Stan Hu
2631b2a1d2 Merge branch 'bump-base-image-versions' into 'master'
Bump the helm and kubectl used in the charts base image

See merge request gitlab-org/gitlab-build-images!226
2019-09-19 21:36:48 +00:00
DJ Mountney
a19bc4b9ca Bump the helm and kubectl used in the charts base image
The kubectl is far out of date, bump it to the version we are currently
using elsewhere in the chart

The Helm version is recent, but there is a newer patch that fixes some
issues with CRD updating we are encountering in the charts.
2019-09-19 11:32:01 -07:00
Rémy Coutable
d14735656f Merge branch 'leipert-add-node-to-www' into 'master'
Add node to www rspec image

See merge request gitlab-org/gitlab-build-images!225
2019-09-10 11:24:00 +00:00
Lukas 'Eipi' Eipert
7e8c707b2c Add node to www rspec image 2019-09-10 09:17:23 +00:00
Achilleas Pipinellis
83e34e977f Merge branch 'new-docs-lint-image' into 'master'
Use a new revision of gitlab-docs which contains mdl

See merge request gitlab-org/gitlab-build-images!224
2019-09-09 12:21:55 +00:00
Achilleas Pipinellis
d2f52db669
Use a new revision of gitlab-docs which contains mdl
https://gitlab.com/gitlab-org/gitlab-docs/merge_requests/547

We need this for older GitLab versions, otherwise the docs lint
job will fail https://dev.gitlab.org/gitlab/gitlabhq/-/jobs/5263777.
2019-09-09 13:14:20 +02:00
Stan Hu
3a547d7398 Merge branch 'add-alpine-helm' into 'master'
Add alpine-helm image used in Charts

See merge request gitlab-org/gitlab-build-images!221
2019-09-05 09:54:01 +00:00
Stan Hu
59b2b2ca85 Merge branch 'update-docs-revision' into 'master'
Update docs revision

See merge request gitlab-org/gitlab-build-images!222
2019-09-05 09:53:10 +00:00
Achilleas Pipinellis
0faa7ddc5c
Update docs revision
We need to use a recent version of Nanoc, since it fixes a bug
causing the builds to fail.

https://gitlab.com/gitlab-org/gitlab-docs/issues/395
2019-09-05 09:26:05 +02:00
Balasankar "Balu" C
0e893fe349
Add alpine-helm image used in Charts
Signed-off-by: Balasankar "Balu" C <balasankar@gitlab.com>
2019-09-05 11:18:45 +05:30
Stan Hu
8ead021c4d Pin all Ruby 2.6 images to 2.6.3
Ruby 2.6.4 may have a string bug:
https://bugs.ruby-lang.org/issues/16136
2019-09-04 16:13:20 -07:00
Stan Hu
09c603637d Merge branch 'jc-add-go-1.13' into 'master'
Adding go1.13 for gitaly

See merge request gitlab-org/gitlab-build-images!220
2019-09-04 17:25:10 +00:00
Stan Hu
04752e7c5c Add Golang 1.13 to scripts/custom-docker-build 2019-09-04 09:59:30 -07:00
John Cai
ddbacaf935 Adding go1.13 for gitaly 2019-09-04 09:12:28 -07:00
Stan Hu
1f41bc6fb5 Merge branch 'ak/fix-danger-locale' into 'master'
Set a UTF-8 locale for Danger

See merge request gitlab-org/gitlab-build-images!218
2019-08-27 12:35:32 +00:00
Adrien Kohlbecker
e2f9674612 Set a UTF-8 locale for Danger 2019-08-27 12:35:32 +00:00
Stan Hu
8c8101920d Merge branch 'gitlab-docs-pin-markdownlint' into 'master'
Pin version of markdownlint-cli

See merge request gitlab-org/gitlab-build-images!219
2019-08-26 22:08:45 +00:00
Achilleas Pipinellis
cdd7cd9bca
Pin version of markdownlint-cli 2019-08-23 13:14:25 +02:00
Stan Hu
fb6257d56f Merge branch 'deprecate-ruby-2.4-images' into 'master'
Remove ruby-2.4.5 images

See merge request gitlab-org/gitlab-build-images!216
2019-08-12 17:06:56 +00:00
Takuya Noguchi
c9febd6d1e Remove ruby-2.4.5 images originally prepared for www-gitlab-com
Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
2019-08-12 17:45:14 +01:00
Stan Hu
8886802c43 Merge branch 'update-docker-to-19.03.1' into 'master'
Update Docker CE to 19.03.1

See merge request gitlab-org/gitlab-build-images!215
2019-08-12 15:51:56 +00:00
Takuya Noguchi
1f1998947b Update Docker CE to 19.03.1
Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
2019-08-12 13:18:20 +01:00
Stan Hu
e46fa3a807 Merge branch 'update-graphicsmagick-to-1.3.33' into 'master'
Update GraphicsMagick to 1.3.33

See merge request gitlab-org/gitlab-build-images!214
2019-08-09 23:09:31 +00:00
Takuya Noguchi
dc1bd0d128 Update GraphicsMagick to 1.3.33
Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
2019-08-09 18:08:56 +01:00
Andrew Newdigate
48a909b540 Merge branch 'zj-git-2.22-for-rails' into 'master'
Bump Git version for Rails tests

See merge request gitlab-org/gitlab-build-images!213
2019-08-07 12:27:36 +00:00
Zeger-Jan van de Weg
56ce5da995
Bump Git version for Rails tests
Gitaly tests against 2.22 already, and is looking at dropping support
for 2.21 once the work on partial clone starts in 12.3. This change
prepares the move for GitLab-Rails to use Git 2.22 in their tests.

Part of: https://gitlab.com/gitlab-org/gitaly/issues/1715
2019-08-07 14:09:25 +02:00
Stan Hu
f88acd9348 Merge branch 'sh-debian-www' into 'master'
Use Debian Stretch instead of Buster

See merge request gitlab-org/gitlab-build-images!212
2019-08-06 02:02:17 +00:00
Stan Hu
35e722c63d Use Debian Stretch instead of Buster
This is to prevent mismatches between the build and test
images:

https://gitlab.com/gitlab-com/www-gitlab-com/merge_requests/27103
2019-08-05 18:46:31 -07:00
Sean McGivern
cda7afbf6d Merge branch 'leipert-pin-docs-image-nanoc' into 'master'
Pin version of GitLab Docs to last known working version

See merge request gitlab-org/gitlab-build-images!211
2019-07-30 12:56:45 +00:00
Lukas Eipert
8004030d65
Pin version of GitLab Docs 2019-07-30 14:41:07 +02:00
Lin Jen-Shin
fac433faa6 Merge branch 'update-helm-to-2.14.2-in-Dockerfile.gitlab-charts-build-base' into 'master'
Update Helm to 2.14.2 in Dockerfile.gitlab-charts-build-base

See merge request gitlab-org/gitlab-build-images!210
2019-07-30 09:07:33 +00:00
Rémy Coutable
8b38eff715 Update Helm to 2.14.2 in Dockerfile.gitlab-charts-build-base 2019-07-30 07:18:28 +00:00
Stan Hu
3eb5f39f74 Merge branch 'add-debian-buster-image' into 'master'
Add image for Debian Buster

See merge request gitlab-org/gitlab-build-images!209
2019-07-11 16:03:04 +00:00
Balasankar "Balu" C
e10a657452
Add image for Debian Buster
Signed-off-by: Balasankar "Balu" C <balasankar@gitlab.com>
2019-07-11 20:55:24 +05:30
Achilleas Pipinellis
eda8237401 Merge branch 'add-markdownlint-cli-to-docs-image' into 'master'
Add markdownlint-cli to docs image

See merge request gitlab-org/gitlab-build-images!206
2019-07-09 09:08:35 +00:00
Evan Read
ebd6b5fd9e Add markdownlint-cli to docs image 2019-07-09 09:08:35 +00:00
Stan Hu
6edc690474 Merge branch 'sh-downgrade-node-www-gitlab-com' into 'master'
Pin www-gitlab-com build to Node v12.4

See merge request gitlab-org/gitlab-build-images!208
2019-07-09 04:10:03 +00:00
Stan Hu
8189962da1 Pin www-gitlab-com build to Node v12.4
Similar to
https://gitlab.com/gitlab-org/gitlab-build-images/merge_requests/207,
Node v12.6 has memory issues. There may also be issues with getting yarn
and npx working in the current build.
2019-07-08 20:54:24 -07:00
Mike Greiling
84bff20408 Merge branch 'leipert-pin-node' into 'master'
Pin node versions

See merge request gitlab-org/gitlab-build-images!207
2019-07-09 01:51:15 +00:00
Lukas Eipert
caae675aee
Pin node versions 2019-07-09 03:37:09 +02:00
Stan Hu
ac83e5a4e0 Merge branch 'zj-bump-git-2.22' into 'master'
Bump Git version for Gitaly to 2.22

See merge request gitlab-org/gitlab-build-images!204
2019-07-08 17:44:43 +00:00
Zeger-Jan van de Weg
ad0c9cc73e
Bump Git version for Gitaly to 2.22
Gitaly runs on anything beyond 2.21, and will remain to do so until
partial clone will be supported. In 2.22 a security issue was fixed, so
that's the minimal version Gitaly should use.

Part of: https://gitlab.com/gitlab-org/gitaly/issues/1715
2019-07-08 11:04:57 +02:00
Zeger-Jan van de Weg
3411879c1e Merge branch 'master' into 'master'
Add Dockerfile syntax highlighting

See merge request gitlab-org/gitlab-build-images!167
2019-07-08 08:28:07 +00:00