Merge branch 'master' into test-properties

OWASP · Dec 16, 2021 · 09de10b · 09de10b
2 parents 9c4e6d0 + 3c595ff
commit 09de10b
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 9 deletions.
diff --git a/Dockerfile.web b/Dockerfile.web
@@ -1,6 +1,6 @@
-FROM jeroenwillemsen/wrongsecrets:1.1.9-no-vault
+FROM jeroenwillemsen/wrongsecrets:1.1.10-no-vault
 
-ARG argBasedVersion="1.1.9"
+ARG argBasedVersion="1.1.10"
 ENV APP_VERSION=$argBasedVersion
 ENV K8S_ENV=Heroku(Docker)
 ENV challengedockermtpath="/var/helpers"

diff --git a/README.md b/README.md
@@ -23,7 +23,7 @@ For the basic docker exercises you currently require:
 You can install it by doing:
 
 ```bash
-docker run -p 8080:8080 jeroenwillemsen/wrongsecrets:1.1.9-no-vault
+docker run -p 8080:8080 jeroenwillemsen/wrongsecrets:1.1.10-no-vault
 ```
 
 Now you can try to find the secrets by means of solving the challenge offered at:

diff --git a/aws/k8s/secret-challenge-vault-deployment.yml b/aws/k8s/secret-challenge-vault-deployment.yml
@@ -33,7 +33,7 @@ spec:
             volumeAttributes:
               secretProviderClass: "wrongsecrets-aws-secretsmanager"
       containers:
-        - image: jeroenwillemsen/wrongsecrets:1.1.9-k8s-vault
+        - image: jeroenwillemsen/wrongsecrets:1.1.10-k8s-vault
           imagePullPolicy: IfNotPresent
           ports:
             - containerPort: 8080

diff --git a/gcp/k8s/secret-challenge-vault-deployment.yml.tpl b/gcp/k8s/secret-challenge-vault-deployment.yml.tpl
@@ -33,7 +33,7 @@ spec:
             volumeAttributes:
               secretProviderClass: "wrongsecrets-gcp-secretsmanager"
       containers:
-        - image: jeroenwillemsen/wrongsecrets:1.1.9-k8s-vault
+        - image: jeroenwillemsen/wrongsecrets:1.1.10-k8s-vault
           imagePullPolicy: IfNotPresent
           ports:
             - containerPort: 8080

diff --git a/k8s/secret-challenge-deployment.yml b/k8s/secret-challenge-deployment.yml
@@ -25,7 +25,7 @@ spec:
       name: secret-challenge
     spec:
       containers:
-        - image: jeroenwillemsen/wrongsecrets:1.1.9-no-vault
+        - image: jeroenwillemsen/wrongsecrets:1.1.10-no-vault
           imagePullPolicy: IfNotPresent
           ports:
             - containerPort: 8080

diff --git a/k8s/secret-challenge-vault-deployment.yml b/k8s/secret-challenge-vault-deployment.yml
@@ -26,7 +26,7 @@ spec:
     spec:
       serviceAccountName: vault
       containers:
-        - image: jeroenwillemsen/wrongsecrets:1.1.9-k8s-vault
+        - image: jeroenwillemsen/wrongsecrets:1.1.10-k8s-vault
           imagePullPolicy: IfNotPresent
           ports:
             - containerPort: 8080

diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html
@@ -13,8 +13,7 @@
     <th:block layout:fragment="content"></th:block>
 </div>
 
-<script th:src="@{/webjars/popper.js/2.10.2/umd/popper.min.js}"></script>
-<script th:src="@{/webjars/bootstrap/5.1.3/js/bootstrap.min.js}"></script>
+<script th:src="@{/webjars/bootstrap/5.1.3/js/bootstrap.bundle.min.js}"></script>
 <script th:src="@{/webjars/github-buttons/2.14.1/dist/buttons.js}"></script>
 </body>
 </html>