Compare commits
36 Commits
a84425f56b
..
main
| Author | SHA1 | Date | |
|---|---|---|---|
| 50551bec95 | |||
| 96e6a8ca02 | |||
| f112b392fa | |||
| 9d122bac28 | |||
| 7bb0b34fbb | |||
| 9cb5a3e7a6 | |||
| ec15e59428 | |||
| e8d3b999d6 | |||
| eb518de902 | |||
| 39246e5e6f | |||
| 4a386f3d49 | |||
| 2d4800c314 | |||
| 82e1619ec3 | |||
| 9268190f03 | |||
| 20e96e4cee | |||
|
e5a0a1d183
|
|||
| 58c510e88e | |||
| be9c7e6d17 | |||
| 22a2f24139 | |||
| 12044c8938 | |||
| 44cff860bb | |||
| 4743385057 | |||
| 5192d7e519 | |||
| fc9859813b | |||
| e4f81a6a05 | |||
| 62fcf145c2 | |||
| 4e66ff7d04 | |||
| d0dbb0202d | |||
|
af34452e36
|
|||
| 01605db74c | |||
| 6bc4bd262b | |||
| 327af0d995 | |||
| 351f01cffc | |||
| 38160843e0 | |||
| 6951af02ad | |||
|
09a07973cb
|
@@ -1,25 +0,0 @@
|
|||||||
include:
|
|
||||||
- template: 'Workflows/MergeRequest-Pipelines.gitlab-ci.yml'
|
|
||||||
|
|
||||||
stages:
|
|
||||||
- build
|
|
||||||
- deploy-prod
|
|
||||||
|
|
||||||
image: buildtool/build-tools:${BUILDTOOLS_VERSION}
|
|
||||||
|
|
||||||
build:
|
|
||||||
stage: build
|
|
||||||
script:
|
|
||||||
- build
|
|
||||||
- push
|
|
||||||
|
|
||||||
deploy-to-prod:
|
|
||||||
stage: deploy-prod
|
|
||||||
when: on_success
|
|
||||||
script:
|
|
||||||
- echo Deploy to PROD.
|
|
||||||
- deploy prod
|
|
||||||
environment:
|
|
||||||
name: prod
|
|
||||||
only:
|
|
||||||
- master
|
|
||||||
+2
-2
@@ -1,4 +1,4 @@
|
|||||||
FROM amd64/nginx:1.29.4-alpine@sha256:989bc942e26cb0ab099b3aea469ff7000ced1888c479c2040c289f93d854be97 as build
|
FROM amd64/nginx:1.30.0-alpine@sha256:d402d461fe2c2510abac96bfa06a4342f9978c7deec9618828f4ee7a4bd3e2e1 as build
|
||||||
|
|
||||||
RUN apk add --update \
|
RUN apk add --update \
|
||||||
wget
|
wget
|
||||||
@@ -13,7 +13,7 @@ COPY ./ /site
|
|||||||
WORKDIR /site
|
WORKDIR /site
|
||||||
RUN hugo
|
RUN hugo
|
||||||
|
|
||||||
FROM amd64/nginx:1.29.4-alpine@sha256:989bc942e26cb0ab099b3aea469ff7000ced1888c479c2040c289f93d854be97
|
FROM amd64/nginx:1.30.0-alpine@sha256:d402d461fe2c2510abac96bfa06a4342f9978c7deec9618828f4ee7a4bd3e2e1
|
||||||
ADD default.conf /etc/nginx/conf.d/default.conf
|
ADD default.conf /etc/nginx/conf.d/default.conf
|
||||||
COPY --from=build /site/public /usr/share/nginx/html
|
COPY --from=build /site/public /usr/share/nginx/html
|
||||||
|
|
||||||
|
|||||||
+1
-2
@@ -44,7 +44,7 @@ spec:
|
|||||||
periodSeconds: 5
|
periodSeconds: 5
|
||||||
timeoutSeconds: 5
|
timeoutSeconds: 5
|
||||||
imagePullPolicy: Always
|
imagePullPolicy: Always
|
||||||
image: oci.unbound.se/unboundsoftware/unbound-site@sha256:57fadab9a3e985e4938b778e2e6b2bb3b0ece78fecc1abcbc568abfc948462ad:${COMMIT}
|
image: oci.unbound.se/unboundsoftware/unbound-site:${COMMIT}
|
||||||
ports:
|
ports:
|
||||||
- containerPort: 80
|
- containerPort: 80
|
||||||
resources:
|
resources:
|
||||||
@@ -52,7 +52,6 @@ spec:
|
|||||||
cpu: 5m
|
cpu: 5m
|
||||||
memory: 5Mi
|
memory: 5Mi
|
||||||
limits:
|
limits:
|
||||||
cpu: 300m
|
|
||||||
memory: 300Mi
|
memory: 300Mi
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ version: 2.1
|
|||||||
jobs:
|
jobs:
|
||||||
build-check:
|
build-check:
|
||||||
docker:
|
docker:
|
||||||
- image: cibuilds/hugo:0.154@sha256:cd1ba9049ba16b138a11a7ceb06f699bc5b20929ee88db7d7cb5b20d5a955bf1
|
- image: cibuilds/hugo:0.160@sha256:e0f489b0eef88e6366e239e9afe003e7154e6892754b4274094ed6c7b7e68d5a
|
||||||
working_directory: ~/LoveIt
|
working_directory: ~/LoveIt
|
||||||
steps:
|
steps:
|
||||||
- checkout
|
- checkout
|
||||||
|
|||||||
Generated
+339
-339
File diff suppressed because it is too large
Load Diff
@@ -5,13 +5,13 @@
|
|||||||
"private": true,
|
"private": true,
|
||||||
"dependencies": {},
|
"dependencies": {},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@babel/cli": "7.28.3",
|
"@babel/cli": "7.28.6",
|
||||||
"@babel/core": "7.28.5",
|
"@babel/core": "7.29.0",
|
||||||
"@babel/preset-env": "7.28.5",
|
"@babel/preset-env": "7.29.2",
|
||||||
"babel-preset-minify": "0.5.2",
|
"babel-preset-minify": "0.5.2",
|
||||||
"babelify": "10.0.0",
|
"babelify": "10.0.0",
|
||||||
"browserify": "17.0.1",
|
"browserify": "17.0.1",
|
||||||
"core-js": "3.47.0",
|
"core-js": "3.49.0",
|
||||||
"husky": "9.1.7",
|
"husky": "9.1.7",
|
||||||
"minimist": "1.2.8",
|
"minimist": "1.2.8",
|
||||||
"segmentit": "2.0.3"
|
"segmentit": "2.0.3"
|
||||||
|
|||||||
Reference in New Issue
Block a user