GitHub/pbot
3
0
Fork 0
mirror of https://github.com/pragma-/pbot.git synced 2026-05-24 08:13:25 +02:00
Code Issues Projects Releases Wiki Activity

More fixes to GitHub workflow.

Browse Source
This commit is contained in:
Alex Belanger 2024-03-11 23:57:38 -04:00
parent 568ebb6c56
commit 7d919450af
No known key found for this signature in database
GPG Key ID: 31736D2B10A5F158
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/candide.yaml vendored
View File

@ -80,7 +80,7 @@ jobs:
- name: Deploy with restart - name: Deploy with restart
if: steps.changed-non-plugin-files.outputs.any_changed == 'true' if: steps.changed-non-plugin-files.outputs.any_changed == 'true'
run: |- run: |-
sed -i -e "s/PROJECT_ID/$PROJECT_ID/g" -e "s/REPOSITORY/$REPOSITORY/g" -e "s/IMAGE/$IMAGE_PBOT/g" -e "s/GITHUB_SHA/$GITHUB_SHA/g" k8s/deployment.yaml sed -i -e "s/PROJECT_ID/$PROJECT_ID/g" -e "s/REPOSITORY/$REPOSITORY/g" -e "s/IMAGE/$IMAGE_PBOT/g" -e "s/GITHUB_SHA/$GITHUB_SHA/g" k8s/candide-pbot.yaml
kubectl apply -f k8s/candide-pbot.yaml kubectl apply -f k8s/candide-pbot.yaml
vms: vms:
@ -118,5 +118,5 @@ jobs:
- name: Deploy - name: Deploy
run: |- run: |-
sed -i -e "s/PROJECT_ID/$PROJECT_ID/g" -e "s/REPOSITORY/$REPOSITORY/g" -e "s/IMAGE/$IMAGE_VM/g" -e "s/GITHUB_SHA/$GITHUB_SHA/g" k8s/deployment.yaml sed -i -e "s/PROJECT_ID/$PROJECT_ID/g" -e "s/REPOSITORY/$REPOSITORY/g" -e "s/IMAGE/$IMAGE_VM/g" -e "s/GITHUB_SHA/$GITHUB_SHA/g" k8s/candide-vm.yaml
kubectl apply -f k8s/candide-vm.yaml kubectl apply -f k8s/candide-vm.yaml

13
applets/pbot-vm/Dockerfile
View File

@ -1,7 +1,7 @@
FROM perl:5.34 FROM perl:5.34
# Install system dependencies. # Install system dependencies.
RUN apt-get update && apt-get install -y clang gcc clang g++ tcl ghc git cpanminus RUN apt-get update && apt-get install -y clang gcc clang g++ tcl ghc git cpanminus dos2unix
# Need the sources. # Need the sources.
COPY . /opt/pbot COPY . /opt/pbot
@ -12,8 +12,15 @@ RUN apt-get install -y socat
RUN sed -i -e "s/\/dev\/ttyS2/\/tmp\/ttyS2/g" /opt/pbot/applets/pbot-vm/guest/bin/guest-server RUN sed -i -e "s/\/dev\/ttyS2/\/tmp\/ttyS2/g" /opt/pbot/applets/pbot-vm/guest/bin/guest-server
RUN sed -i -e "s/\/dev\/ttyS3/\/tmp\/ttyS3/g" /opt/pbot/applets/pbot-vm/guest/bin/guest-server RUN sed -i -e "s/\/dev\/ttyS3/\/tmp\/ttyS3/g" /opt/pbot/applets/pbot-vm/guest/bin/guest-server
# Setup the guest server. # Line endings on other platforms.
RUN cd /opt/pbot/applets/pbot-vm/guest/bin && ls -al RUN find . -type f -print0 | xargs -0 dos2unix /opt/pbot/applets/pbot-vm/guest/bin/*
RUN find . -type f -print0 | xargs -0 dos2unix /opt/pbot/applets/pbot-vm/host/bin/*
RUN dos2unix /opt/pbot/applets/pbot-vm/entrypoint.sh
RUN chmod +x /opt/pbot/applets/pbot-vm/guest/bin/*
RUN chmod +x /opt/pbot/applets/pbot-vm/host/bin/*
RUN chmod +x /opt/pbot/applets/pbot-vm/entrypoint.sh
# Setup the guest.
RUN cd /opt/pbot/applets/pbot-vm && ./guest/bin/setup-guest RUN cd /opt/pbot/applets/pbot-vm && ./guest/bin/setup-guest
# Prefer a non-root user. # Prefer a non-root user.