pub-solar/os
5
0
Fork 2
Code Issues 4 Pull requests Packages Projects 1 Releases Wiki Activity

git: is ssh:// better?

Browse source
This commit is contained in:
teutat3s 2021-06-15 00:38:53 +02:00
parent e8ed283427
commit eb39742886
Signed by: teutat3s
GPG key ID: 4FA1D3FA524F22C1
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.drone.yml
View file

@ -20,7 +20,8 @@ steps:
HOME: /root HOME: /root
commands: commands:
- git clone -b devos https://git.b12f.io/pub-solar/os . - git clone -b devos https://git.b12f.io/pub-solar/os .
- git remote add devos https://git.b12f.io/pub-solar/devos - ./.drone/setup_ssh.sh
- git remote add devos git@git.b12f.io:pub-solar/devos
- git fetch --all - git fetch --all
- git merge -X theirs devos/core - git merge -X theirs devos/core
- git push origin devos - git push origin devos
@ -42,6 +43,7 @@ steps:
from_secret: gitea_ssh_key from_secret: gitea_ssh_key
HOME: /root HOME: /root
commands: commands:
- ./.drone/setup_ssh.sh
- git fetch --all - git fetch --all
- git checkout --track origin/core - git checkout --track origin/core
- git merge origin/devos - git merge origin/devos

2
.drone/setup_ssh.sh
View file

@ -1,7 +1,5 @@
#!/bin/bash #!/bin/bash
# Setup ssh inside container # Setup ssh inside container
# This is a hack because nixery containers contain no passwd file, which openssh wants to read
echo "root:x:0:0:System administrator:/root:/run/current-system/sw/bin/bash" >> /etc/passwd
mkdir -p ~/.ssh mkdir -p ~/.ssh
echo "$GITEA_SSH_KEY" > ~/.ssh/id_rsa echo "$GITEA_SSH_KEY" > ~/.ssh/id_rsa
echo "[git.b12f.io]:2222 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ4uaREL7acSSCNAX+voDYl1Kj7JipP62fR5x1UyGP9u" >> ~/.ssh/known_hosts echo "[git.b12f.io]:2222 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ4uaREL7acSSCNAX+voDYl1Kj7JipP62fR5x1UyGP9u" >> ~/.ssh/known_hosts