Merge branch 'master' into upgrade/22-gitea
This commit is contained in:
commit
f73c58d7ee
18
README.md
18
README.md
|
@ -3,6 +3,24 @@
|
||||||
This repository contains configuration files and other assets, that are used to
|
This repository contains configuration files and other assets, that are used to
|
||||||
deploy and operate this Gitea instance.
|
deploy and operate this Gitea instance.
|
||||||
|
|
||||||
|
To create a new image containing the customizations:
|
||||||
|
|
||||||
|
Edit `packer/custom.json` to increment the tag, then run this script (needs
|
||||||
|
[Packer](https://www.packer.io/) in your path)
|
||||||
|
|
||||||
|
```
|
||||||
|
./script/build_customizations_image
|
||||||
|
```
|
||||||
|
|
||||||
|
Then edit `kubernetes/gitea-server.yaml` to use the new tag
|
||||||
|
(`image: eu.gcr.io/fluted-magpie-218106/gitea_custom:$VERSION`) and apply the
|
||||||
|
change:
|
||||||
|
|
||||||
|
```
|
||||||
|
cd kubernetes
|
||||||
|
kubectl apply -f gitea-server.yaml
|
||||||
|
```
|
||||||
|
|
||||||
Feel free to [open issues] for questions, suggestions, bugs, to-do items, and
|
Feel free to [open issues] for questions, suggestions, bugs, to-do items, and
|
||||||
whatever else you want to discuss or resolve.
|
whatever else you want to discuss or resolve.
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,11 @@
|
||||||
|
#db231d bug ; Something is not working
|
||||||
|
#76db1d enhancement ; Improving existing functionality
|
||||||
|
#1d76db feature ; New functionality
|
||||||
|
#db1d76 idea ; Something to consider
|
||||||
|
#db1d76 question ; Looking for an answer
|
||||||
|
#fbca04 security ; All your base are belong to us
|
||||||
|
#1dd5db ui/ux ; User interface, process design, etc.
|
||||||
|
#333333 dev environment ; Config, builds, CI, deployment, etc.
|
||||||
|
#cccccc duplicate ; This issue or pull request already exists
|
||||||
|
#cccccc invalid ; Not a bug
|
||||||
|
#cccccc wontfix ; This won't be fixed
|
|
@ -0,0 +1,14 @@
|
||||||
|
#db231d bug ; Something is not working
|
||||||
|
#76db1d enhancement ; Improving existing functionality
|
||||||
|
#1d76db feature ; New functionality
|
||||||
|
#db1d76 idea ; Something to consider
|
||||||
|
#db1d76 question ; Looking for an answer
|
||||||
|
#fbca04 security ; All your base are belong to us
|
||||||
|
#1dd5db ui/ux ; User interface, process design, etc.
|
||||||
|
#333333 dev environment ; Config, builds, CI, deployment, etc.
|
||||||
|
#008080 kredits-1 ; Small contribution
|
||||||
|
#008080 kredits-2 ; Medium contribution
|
||||||
|
#008080 kredits-3 ; Large contribution
|
||||||
|
#cccccc duplicate ; This issue or pull request already exists
|
||||||
|
#cccccc invalid ; Not a bug
|
||||||
|
#cccccc wontfix ; This won't be fixed
|
|
@ -32,13 +32,19 @@ spec:
|
||||||
value: gitea
|
value: gitea
|
||||||
image: mariadb:10.3.10
|
image: mariadb:10.3.10
|
||||||
name: gitea-db
|
name: gitea-db
|
||||||
resources: {}
|
|
||||||
ports:
|
ports:
|
||||||
- containerPort: 3306
|
- containerPort: 3306
|
||||||
name: mysql
|
name: mysql
|
||||||
volumeMounts:
|
volumeMounts:
|
||||||
- mountPath: /var/lib/mysql
|
- mountPath: /var/lib/mysql
|
||||||
name: gitea-db-data
|
name: gitea-db-data
|
||||||
|
resources:
|
||||||
|
requests:
|
||||||
|
cpu: 250m
|
||||||
|
memory: 150Mi
|
||||||
|
limits:
|
||||||
|
cpu: 500m
|
||||||
|
memory: 300Mi
|
||||||
restartPolicy: Always
|
restartPolicy: Always
|
||||||
volumes:
|
volumes:
|
||||||
- name: gitea-db-data
|
- name: gitea-db-data
|
||||||
|
|
|
@ -14,17 +14,20 @@ spec:
|
||||||
spec:
|
spec:
|
||||||
initContainers:
|
initContainers:
|
||||||
- name: init-config
|
- name: init-config
|
||||||
image: busybox
|
# This is a busybox image with our gitea customizations saved to
|
||||||
command: ['sh', '-c', 'mkdir -p /data/gitea/conf && mkdir -p /data/gitea/https && cp /root/conf/app.ini /data/gitea/conf/app.ini && chown 1000:1000 /data/gitea/conf/app.ini && chmod 660 /data/gitea/conf/app.ini && cp /root/conf/*.pem /data/gitea/https && chmod 600 /data/gitea/https/*.pem && chown -R 1000:1000 /data/gitea']
|
# /custom, built using ./script/build_customizations_image from the
|
||||||
|
# root of the repo
|
||||||
|
image: eu.gcr.io/fluted-magpie-218106/gitea_custom:0.1
|
||||||
|
command: [
|
||||||
|
'sh', '-c',
|
||||||
|
'mkdir -p /data/gitea/conf && mkdir -p /data/gitea/https && cp /root/conf/app.ini /data/gitea/conf/app.ini && chown 1000:1000 /data/gitea/conf/app.ini && chmod 660 /data/gitea/conf/app.ini && cp /root/conf/*.pem /data/gitea/https && chmod 600 /data/gitea/https/*.pem && cp -R /custom/* /data/gitea && chown -R 1000:1000 /data/gitea'
|
||||||
|
]
|
||||||
volumeMounts:
|
volumeMounts:
|
||||||
- mountPath: /data
|
- mountPath: /data
|
||||||
name: gitea-server-data
|
name: gitea-server-data
|
||||||
- mountPath: /root/conf
|
- mountPath: /root/conf
|
||||||
name: config
|
name: config
|
||||||
containers:
|
containers:
|
||||||
# This is only used for the initial setup, it does nothing once a app.ini
|
|
||||||
# file exists in the conf/ directory of the data directory
|
|
||||||
# (/data/gitea/conf in our case)
|
|
||||||
- name: gitea-server
|
- name: gitea-server
|
||||||
image: gitea/gitea:1.8.0
|
image: gitea/gitea:1.8.0
|
||||||
ports:
|
ports:
|
||||||
|
@ -34,6 +37,13 @@ spec:
|
||||||
volumeMounts:
|
volumeMounts:
|
||||||
- mountPath: /data
|
- mountPath: /data
|
||||||
name: gitea-server-data
|
name: gitea-server-data
|
||||||
|
resources:
|
||||||
|
requests:
|
||||||
|
cpu: 250m
|
||||||
|
memory: 256Mi
|
||||||
|
limits:
|
||||||
|
cpu: 500m
|
||||||
|
memory: 512Mi
|
||||||
restartPolicy: Always
|
restartPolicy: Always
|
||||||
volumes:
|
volumes:
|
||||||
- name: gitea-server-data
|
- name: gitea-server-data
|
||||||
|
|
|
@ -0,0 +1,29 @@
|
||||||
|
{
|
||||||
|
"builders": [{
|
||||||
|
"type": "docker",
|
||||||
|
"image": "busybox",
|
||||||
|
"run_command": ["-d", "-i", "-t", "{{.Image}}", "/bin/sh"],
|
||||||
|
"commit": true
|
||||||
|
}],
|
||||||
|
"provisioners": [
|
||||||
|
{
|
||||||
|
"inline": ["mkdir /custom"],
|
||||||
|
"type": "shell"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "file",
|
||||||
|
"source": "../custom/",
|
||||||
|
"destination": "/custom"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"post-processors": [
|
||||||
|
[
|
||||||
|
{
|
||||||
|
"type": "docker-tag",
|
||||||
|
"repository": "eu.gcr.io/fluted-magpie-218106/gitea_custom",
|
||||||
|
"tag": "0.1"
|
||||||
|
},
|
||||||
|
"docker-push"
|
||||||
|
]
|
||||||
|
]
|
||||||
|
}
|
|
@ -0,0 +1,7 @@
|
||||||
|
#!/usr/bin/env bash
|
||||||
|
# fail fast
|
||||||
|
set -e
|
||||||
|
|
||||||
|
cd packer/
|
||||||
|
packer build custom.json
|
||||||
|
cd -
|
Reference in New Issue