Skip to content

Commit 5e15a56

Browse files
committed
update Dockerfile and deployment
1 parent 1e5dc90 commit 5e15a56

File tree

3 files changed

+53
-37
lines changed

3 files changed

+53
-37
lines changed

Dockerfile

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,10 @@
11
# ghcr.io/consol-monitoring/ocd:0.140.2-1
2-
# consol's image will get the tag from hugomods/hugo
2+
# consol's image tag will be the version from floryn90/hugo:{version}-ext-alpine
33
# plus an extra prerelease number in case there are
44
# any changes here in this Dockerfile. (it is not actually a pre-release,
5-
# but the tag has to conform to the semver scheme, whre only 3 numbers
5+
# but the tag has to conform to the semver scheme, where only 3 numbers
66
# are allowed)
7-
#FROM hugomods/hugo:0.140.2
87
FROM floryn90/hugo:0.140.2-ext-alpine
98
USER root
109
RUN apk add git && \
1110
git config --global --add safe.directory /src
12-
#RUN npm install -g postcss-cli
13-
#RUN npm install autoprefixer
14-
#RUN npm audit fix
15-
#USER hugo
16-
#WORKDIR /home/hugo
17-
#RUN npm config set prefix "/home/hugo/vendor/node_modules"
18-
#RUN npm install -g postcss-cli
19-
#RUN npm config set prefix "/home/hugo/vendor/node_modules"
20-
#RUN npm install autoprefixer
21-
#RUN npm config set prefix "/home/hugo/vendor/node_modules"
22-
#RUN npm audit fix

deployment/ocd-05-deployment.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -95,13 +95,13 @@ spec:
9595
mountPath: /tmp/.gitconfig
9696
subPath: dotgitconfig
9797
- name: git-sync
98-
image: k8s.gcr.io/git-sync/git-sync:v3.2.2
98+
image: k8s.gcr.io/git-sync/git-sync:v4.4.0
9999
args:
100-
- "-repo=$(GIT_REPO_URL)"
101-
- "-branch=$(GIT_BRANCH)"
102-
- "-wait=20"
103-
- "-root=/tmp/git"
104-
- "-dest=ocd"
100+
- "--repo=$(GIT_REPO_URL)"
101+
- "--branch=$(GIT_BRANCH)"
102+
- "--one-time"
103+
- "--root=/tmp/git"
104+
- "--link=ocd"
105105
envFrom:
106106
- configMapRef:
107107
name: git-repo

package.json

Lines changed: 45 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,52 @@
11
{
2-
"name": "tech-doc-hugo",
3-
"version": "0.0.1",
4-
"description": "Hugo theme for technical documentation.",
5-
"main": "none.js",
2+
"name": "docsy-example-site",
3+
"version": "0.10.0",
4+
"version.next": "0.10.1-dev.0-unreleased",
5+
"description": "Example site that uses Docsy theme for technical documentation.",
6+
"repository": "github:google/docsy-example",
7+
"homepage": "https://example.docsy.dev",
8+
"author": "Docsy Authors",
9+
"license": "Apache-2.0",
10+
"bugs": "https://github.com/google/docsy-example/issues",
11+
"spelling": "cSpell:ignore docsy hugo htmltest precheck postbuild rtlcss -",
612
"scripts": {
7-
"test": "echo \"Error: no test specified\" && exit 1"
13+
"_build": "npm run _hugo-dev --",
14+
"_check:links": "echo IMPLEMENTATION PENDING for check-links; echo",
15+
"_hugo": "hugo --cleanDestinationDir",
16+
"_hugo-dev": "npm run _hugo -- -e dev -DFE",
17+
"_local": "npx cross-env HUGO_MODULE_WORKSPACE=docsy.work",
18+
"_serve": "npm run _hugo-dev -- --minify serve --renderToMemory",
19+
"build:preview": "npm run _hugo-dev -- --minify --baseURL \"${DEPLOY_PRIME_URL:-/}\"",
20+
"build:production": "npm run _hugo -- --minify",
21+
"build": "npm run _build -- ",
22+
"check:links:all": "HTMLTEST_ARGS= npm run _check:links",
23+
"check:links": "npm run _check:links",
24+
"clean": "rm -Rf public/* resources",
25+
"local": "npm run _local -- npm run",
26+
"make:public": "git init -b main public",
27+
"precheck:links:all": "npm run build",
28+
"precheck:links": "npm run build",
29+
"postbuild:preview": "npm run _check:links",
30+
"postbuild:production": "npm run _check:links",
31+
"serve": "npm run _serve",
32+
"test": "npm run check:links",
33+
"update:dep": "npm install --save-dev autoprefixer@latest postcss-cli@latest",
34+
"update:hugo": "npm install --save-dev --save-exact hugo-extended@latest",
35+
"update:pkgs": "npx npm-check-updates -u"
836
},
9-
"repository": {
10-
"type": "git",
11-
"url": "git+https://github.com/google/docsy-example.git"
37+
"devDependencies": {
38+
"autoprefixer": "^10.4.20",
39+
"cross-env": "^7.0.3",
40+
"hugo-extended": "0.140.2",
41+
"postcss-cli": "^11.0.0",
42+
"rtlcss": "^4.3.0"
1243
},
13-
"author": "",
14-
"license": "ISC",
15-
"bugs": {
16-
"url": "https://github.com/google/docsy-example/issues"
44+
"optionalDependencies": {
45+
"npm-check-updates": "^17.1.4"
1746
},
18-
"homepage": "https://github.com/google/docsy-example#readme",
19-
"devDependencies": {
20-
"autoprefixer": "^10.4.0",
21-
"postcss": "^8.3.7",
22-
"postcss-cli": "^9.0.2"
47+
"private": true,
48+
"prettier": {
49+
"proseWrap": "always",
50+
"singleQuote": true
2351
}
2452
}

0 commit comments

Comments
 (0)