Skip to content

Commit

Permalink
Dockerfile: update client base image
Browse files Browse the repository at this point in the history
  • Loading branch information
JonJagger committed Sep 28, 2023
1 parent 55710f5 commit 7d0dd9b
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 15 deletions.
11 changes: 1 addition & 10 deletions .snyk
Original file line number Diff line number Diff line change
@@ -1,10 +1 @@
# Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities.
version: v1.25.0
# ignores vulnerabilities until expiry date; change duration by modifying expiry date
ignore:
SNYK-ALPINE318-PROCPSNG-5877704:
- '*':
reason: Wait for fix in base image
expires: 2023-10-16T04:33:51.513Z
created: 2023-09-16T04:33:51.517Z
patch: {}
# Do not delete this file - it is needed for the snyk_scans repo workflow
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[![Github Action (main)](https://github.com/cyber-dojo/dashboard/actions/workflows/main.yml/badge.svg)](https://github.com/cyber-dojo/dashboard/actions)


- A docker-containerized micro-service for [https://cyber-dojo.org](http://cyber-dojo.org).
- A [docker-containerized](https://registry.hub.docker.com/r/cyberdojo/dashboard) micro-service for [https://cyber-dojo.org](http://cyber-dojo.org).
- The HTTP UI for a group-exercise dashboard.
- A [Kolsi](https://www.kosli.com/) showcase for a [CI flow](https://app.kosli.com/cyber-dojo/flows/dashboard/artifacts/) and an [aws production environment](https://app.kosli.com/cyber-dojo/environments/aws-prod/snapshots/)
- A [Kosli](https://www.kosli.com/) showcase for a [CI flow](https://app.kosli.com/cyber-dojo/flows/dashboard/artifacts/) and an [aws production environment](https://app.kosli.com/cyber-dojo/environments/aws-prod/snapshots/)

- - - -
* [GET alive](docs/api.md#get-alive)
Expand Down
2 changes: 1 addition & 1 deletion sh/containers_up_healthy_and_clean.sh
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ clean_top_5()
{
# 1st 6 lines on Puma
local -r L1="Puma starting in single mode..."
local -r L2='* Puma version: 6.3.1 (ruby 3.2.2-p53) ("Mugi No Toki Itaru")'
local -r L2='* Puma version: 6.4.0 (ruby 3.2.2-p53) ("The Eagle of Durango")'
local -r L3="* Min threads: 0"
local -r L4="* Max threads: 5"
local -r L5="* Environment: production"
Expand Down
2 changes: 1 addition & 1 deletion sources/client/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM cyberdojo/sinatra-base:1fa5420
FROM cyberdojo/sinatra-base:08fbd2d
LABEL maintainer=jon@jaggersoft.com

WORKDIR /app
Expand Down
2 changes: 1 addition & 1 deletion sources/server/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM cyberdojo/sinatra-base:1fa5420
FROM cyberdojo/sinatra-base:08fbd2d
LABEL maintainer=jon@jaggersoft.com

WORKDIR /app
Expand Down

0 comments on commit 7d0dd9b

Please sign in to comment.