Skip to content

Commit

Permalink
#32 Sanitized file permissions and typos
Browse files Browse the repository at this point in the history
during development, some misconfigurations on the files happened.
The german and english development documentation slightly differed, therefor both texts were changed.
  • Loading branch information
marco.bergen committed Oct 15, 2024
1 parent 24dcd45 commit d66864d
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 9 deletions.
Empty file modified CHANGELOG.md
100755 → 100644
Empty file.
4 changes: 2 additions & 2 deletions Dockerfile
100755 → 100644
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
FROM registry.cloudogu.com/official/base:3.20.2-1 as swaggerui
FROM registry.cloudogu.com/official/base:3.20.3-2 as swaggerui
ENV SWAGGERUI_VERSION=5.17.14 \
SWAGGERUI_ZIP_SHA256="481244d0812097b11fbaeef79f71d942b171617f9c9f9514e63acbe13e71ccdc"
RUN apk update && apk add curl
RUN curl -Lsk --fail --silent --location --retry 3 https://github.com/swagger-api/swagger-ui/archive/refs/tags/v${SWAGGERUI_VERSION}.zip -o /tmp/swagger-ui.zip
RUN echo "${SWAGGERUI_ZIP_SHA256} */tmp/swagger-ui.zip" | sha256sum -c -
RUN unzip /tmp/swagger-ui.zip -d /tmp && mv /tmp/swagger-ui-${SWAGGERUI_VERSION}/dist /tmp/dist

FROM registry.cloudogu.com/official/base:3.20.2-1
FROM registry.cloudogu.com/official/base:3.20.3-2
LABEL NAME="official/swaggerui" \
VERSION="4.9.0-5" \
maintainer="[email protected]"
Expand Down
6 changes: 5 additions & 1 deletion docs/development/local_setup_de.md
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@ sha256sum swagger-ui-4.9.0-1.zip > swagger-ui-4.9.0-1.zip.sha256
```
Die Releases werden wieder über die offizielle Seite von swagger-ui gepflegt.
Im Dockerfile des Gogus wird nur noch die entsprechende Version angepasst.
Im Dockerfile des Dogus wird nur noch die entsprechende Version angepasst.
Es muss kein Aktualisierungsmerge des Forks erfolgen.
1. download Artefakt direkt von "swagger-ui"
2. SH256-Prüfsumme erzeugen: "sha256sum swagger-ui.zip"
3. Anpassen der Versionsnummer im Dockerfile
```
7 changes: 4 additions & 3 deletions docs/development/local_setup_en.md
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,12 @@ sha256sum swagger-ui-4.9.0-1.zip > swagger-ui-4.9.0-1.zip.sha256

### Setup since 5.17.14-1
Releases can be found on the official swagger-ui download page.

Only the current version of swagger-ui needs to be adapted in the Dockerfile.
The fork will be dismissed.
```
1. download artefact from swagger-ui
2. generate the checksum
sha256sum swagger-ui.zip
1. download artefact from "swagger-ui"
2. generate the checksum "sha256sum swagger-ui.zip"
3. Edit Dockerfile for new version
```

Empty file modified dogu.json
100755 → 100644
Empty file.
2 changes: 1 addition & 1 deletion resources/var/www/html/cloudogu.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* empty for now - possible overwrite elements for CI purpose */
/* possible overwrite elements for CI purpose */
@font-face {
font-family: 'Droid-Sans'; /* Name your font family */
src: url('./Droid-Sans.woff2'); /* Locate the .ttf file within your directory*/
Expand Down
4 changes: 2 additions & 2 deletions resources/var/www/html/index.html.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<head>
<meta charset="UTF-8">
<title>Swagger UI</title>
<link rel="stylesheet" type="text/css" href="./swagger-ui.css" >
<link rel="stylesheet" type="text/css" href="./cloudogu.css" >
<link rel="stylesheet" type="text/css" href="./swagger-ui.css" />
<link rel="stylesheet" type="text/css" href="./cloudogu.css" />
<link rel="icon" type="image/png" href="./favicon-32x32.png" sizes="32x32" />
<link rel="icon" type="image/png" href="./favicon-16x16.png" sizes="16x16" />
<style>
Expand Down

0 comments on commit d66864d

Please sign in to comment.