Skip to content

Commit e7b2b71

Browse files
author
Sascha Pfeiffer
committed
library upgrades
Signed-off-by: Sascha Pfeiffer <sascha.pfeiffer@esaqa.com>
1 parent 7e8793a commit e7b2b71

16 files changed

+36276
-16863
lines changed

.eslintrc

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
{
2-
"extends": "react-app",
3-
"rules": {
4-
"indent": ["error", 2]
5-
}
6-
}
1+
{
2+
"extends": "react-app",
3+
"rules": {
4+
"indent": "off"
5+
}
6+
}

.gitlab-ci.yml

+39-15
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ test-unittests:
1212
except:
1313
- schedules
1414
stage: test
15-
image: psono-docker.jfrog.io/ubuntu:18.04
15+
image: psono-docker.jfrog.io/ubuntu:22.04
1616
script:
1717
- sh ./var/build-ubuntu.sh
1818
- npm test -- --coverage
@@ -37,7 +37,7 @@ test-vulnerability-scan:
3737
# except:
3838
# - schedules
3939
# stage: test
40-
# image: psono-docker.jfrog.io/ubuntu:18.04
40+
# image: psono-docker.jfrog.io/ubuntu:22.04
4141
# script:
4242
# - sh ./var/build-ubuntu.sh
4343
# - cat ./build/firefox/manifest.json
@@ -59,7 +59,7 @@ build-docker-image:
5959
except:
6060
- schedules
6161
stage: build
62-
image: psono-docker.jfrog.io/ubuntu:18.04
62+
image: psono-docker.jfrog.io/ubuntu:22.04
6363
services:
6464
- docker:18-dind
6565
variables:
@@ -86,7 +86,7 @@ build-webclient:
8686
except:
8787
- schedules
8888
stage: build
89-
image: psono-docker.jfrog.io/ubuntu:18.04
89+
image: psono-docker.jfrog.io/ubuntu:22.04
9090
script:
9191
- sh ./var/download_translations_from_artifactory.sh
9292
- sh ./var/build-ubuntu.sh
@@ -111,7 +111,7 @@ release-artifacts:
111111
except:
112112
- schedules
113113
stage: release
114-
image: psono-docker.jfrog.io/ubuntu:18.04
114+
image: psono-docker.jfrog.io/ubuntu:22.04
115115
script:
116116
- apt-get update
117117
- apt-get install -y curl
@@ -128,9 +128,15 @@ release-docker:
128128
except:
129129
- schedules
130130
stage: release
131-
image: psono-docker.jfrog.io/docker:19.03.8-git
131+
image: psono-docker-enterprise.jfrog.io/docker:20.10.17-git
132132
services:
133-
- docker:18-dind
133+
- name: docker:20-dind
134+
alias: docker
135+
command: ["--tls=false"]
136+
variables:
137+
DOCKER_DRIVER: overlay2
138+
DOCKER_HOST: tcp://docker:2375/
139+
DOCKER_TLS_CERTDIR: ""
134140
script:
135141
- docker info
136142
- echo $CI_JOB_TOKEN | docker login --username=gitlab-ci-token --password-stdin registry.gitlab.com
@@ -146,9 +152,15 @@ release-docker:
146152
# except:
147153
# - schedules
148154
# stage: deploy
149-
# image: psono-docker.jfrog.io/docker:19.03.8-git
155+
# image: psono-docker-enterprise.jfrog.io/docker:20.10.17-git
150156
# services:
151-
# - docker:18-dind
157+
# - name: docker:20-dind
158+
# alias: docker
159+
# command: ["--tls=false"]
160+
# variables:
161+
# DOCKER_DRIVER: overlay2
162+
# DOCKER_HOST: tcp://docker:2375/
163+
# DOCKER_TLS_CERTDIR: ""
152164
# script:
153165
# - docker info
154166
# - echo $artifactory_credentials | docker login --username=gitlab --password-stdin psono-docker.jfrog.io
@@ -162,9 +174,15 @@ deploy-docker:
162174
except:
163175
- schedules
164176
stage: deploy
165-
image: psono-docker.jfrog.io/docker:19.03.8-git
177+
image: psono-docker-enterprise.jfrog.io/docker:20.10.17-git
166178
services:
167-
- docker:18-dind
179+
- name: docker:20-dind
180+
alias: docker
181+
command: ["--tls=false"]
182+
variables:
183+
DOCKER_DRIVER: overlay2
184+
DOCKER_HOST: tcp://docker:2375/
185+
DOCKER_TLS_CERTDIR: ""
168186
script:
169187
- echo $artifactory_credentials | docker login --username=gitlab --password-stdin psono-docker.jfrog.io
170188
- echo $docker_hub_credentials | docker login --username=psonogitlab --password-stdin
@@ -177,9 +195,15 @@ deploy-github:
177195
except:
178196
- schedules
179197
stage: deploy
180-
image: psono-docker.jfrog.io/docker:19.03.8-git
198+
image: psono-docker-enterprise.jfrog.io/docker:20.10.17-git
181199
services:
182-
- docker:18-dind
200+
- name: docker:20-dind
201+
alias: docker
202+
command: ["--tls=false"]
203+
variables:
204+
DOCKER_DRIVER: overlay2
205+
DOCKER_HOST: tcp://docker:2375/
206+
DOCKER_TLS_CERTDIR: ""
183207
script:
184208
- sh ./var/deploy-github.sh
185209
environment:
@@ -193,7 +217,7 @@ deploy-github:
193217
# except:
194218
# - schedules
195219
# stage: deploy
196-
# image: psono-docker.jfrog.io/ubuntu:18.04
220+
# image: psono-docker.jfrog.io/ubuntu:22.04
197221
# script:
198222
# - sh ./var/build-ubuntu.sh
199223
# - sh ./var/deploy-chrome-extension.sh
@@ -208,7 +232,7 @@ deploy-github:
208232
# except:
209233
# - schedules
210234
# stage: deploy
211-
# image: psono-docker.jfrog.io/ubuntu:18.04
235+
# image: psono-docker.jfrog.io/ubuntu:22.04
212236
# script:
213237
# - sh ./var/build-ubuntu.sh
214238
# - sh ./var/deploy-firefox-extension.sh

.nvmrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
16.13.1
1+
16.15.1

0 commit comments

Comments
 (0)