Sync some fixes from production
This commit is contained in:
parent
d1f4f7b9ad
commit
10d75e9d8c
6 changed files with 8 additions and 4 deletions
|
|
@ -2,6 +2,7 @@ server {
|
|||
listen 80 default_server;
|
||||
listen [::]:80 default_server;
|
||||
server_name {{ butter_name }}.local;
|
||||
client_max_body_size 150M;
|
||||
|
||||
location ^~ /chat {
|
||||
alias /var/www/html/chat;
|
||||
|
|
|
|||
|
|
@ -91,6 +91,7 @@ steps:
|
|||
packages:
|
||||
- avahi-daemon
|
||||
- avahi-utils
|
||||
- locales
|
||||
- curl
|
||||
- udisks2
|
||||
- wget
|
||||
|
|
|
|||
|
|
@ -76,6 +76,8 @@ steps:
|
|||
packages:
|
||||
- avahi-daemon
|
||||
- avahi-utils
|
||||
- locales
|
||||
- fake-hwclock
|
||||
- curl
|
||||
- udisks2
|
||||
- wget
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#!/usr/bin/env bash
|
||||
|
||||
GIT_BRANCH=$(git branch --show-current 2>/dev/null)
|
||||
GIT_TAG=$(git tag 2>/dev/null | head -n1)
|
||||
GIT_TAG=$(git tag 2>/dev/null | tail -n1)
|
||||
BUILD_DATE=$(date +"%d%m%y")
|
||||
SUFFIX="${GIT_BRANCH}_${GIT_TAG}_${BUILD_DATE}"
|
||||
time vmdb2 --rootfs-tarball=64_$SUFFIX.tar.gz --output 64_butter_$SUFFIX.img --log 64_butter_$SUFFIX.log amd64_trixie.yaml
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
#!/usr/bin/env bash
|
||||
|
||||
GIT_BRANCH=$(git branch --show-current 2>/dev/null)
|
||||
GIT_TAG=$(git tag 2>/dev/null | head -n1)
|
||||
GIT_TAG=$(git tag 2>/dev/null | tail -n1)
|
||||
BUILD_DATE=$(date +"%d%m%y")
|
||||
SUFFIX="${GIT_BRANCH}_${GIT_TAG}_${BUILD_DATE}"
|
||||
time vmdb2 --rootfs-tarball=raspi4_$SUFFIX.tar.gz --output raspi4_butter_$SUFFIX.img --log raspi4_butter_$SUFFIX.log raspi_4_trixie.yaml
|
||||
tar cvfz raspi4_butter_NOAP_$SUFFIX.img.tar.gz raspi4_butter_$SUFFIX.img
|
||||
tar cvfz raspi4_butter_$SUFFIX.img.tar.gz raspi4_butter_$SUFFIX.img
|
||||
#curl -H "Authorization: token" $CHURN_SECRET -X PUT --upload-file raspi4_butter_$SUFFIX.img.tar.gz https://guardianproject.dev/api/packages/butter/generic/churn/latest/raspi4_butter_$SUFFIX.img.tar.gz
|
||||
#rm *img *tar.gz
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#!/usr/bin/env bash
|
||||
|
||||
GIT_BRANCH=$(git branch --show-current 2>/dev/null)
|
||||
GIT_TAG=$(git tag 2>/dev/null | head -n1)
|
||||
GIT_TAG=$(git tag 2>/dev/null | tail -n1)
|
||||
BUILD_DATE=$(date +"%d%m%y")
|
||||
SUFFIX="${GIT_BRANCH}_${GIT_TAG}_${BUILD_DATE}"
|
||||
time vmdb2 --rootfs-tarball=raspi4_$SUFFIX.tar.gz --output raspi4_butter_$SUFFIX.img --log raspi4_butter_$SUFFIX.log kanglam_pi4.yaml
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue