Skip to content

Commit

Permalink
Merge pull request #92 from chipp/new-ezio
Browse files Browse the repository at this point in the history
Migrate to new ezio
  • Loading branch information
chipp authored Feb 16, 2024
2 parents 0da99a7 + 8ef9301 commit 641a488
Show file tree
Hide file tree
Showing 9 changed files with 13 additions and 13 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
echo "${{ secrets.ssh_key }}" > ~/.ssh/id_rsa
echo "ezio.burdukov.by ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAX96s1j47kGhmSCUnSj/zIkwIE/8Io2uljZgusrVElY" >> ~/.ssh/known_hosts
echo "ezio.chipp.dev ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHynflleQHqQg0GHDph+GkNQARa56hAlJJf4ogGKbwsh" >> ~/.ssh/known_hosts
echo "pi3.chipp.dev ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID4miYPJr5cirlqtd73clGvCXI/kiqe23UkfXTtgDyuM" >> ~/.ssh/known_hosts
echo "Host pi3.chipp.dev" > ~/.ssh/config
Expand All @@ -73,8 +73,8 @@ jobs:
scp conf/docker-compose.yml conf/mq.conf \
[email protected]:web/mq_lisa
ssh chipp@ezio.burdukov.by \
"cd ~/web/mq_lisa && docker-compose down --remove-orphans --rmi all && docker-compose up -d"
ssh chipp@ezio.chipp.dev \
"cd ~/web/mq_lisa && docker compose down --remove-orphans --rmi all && docker compose up -d"
- name: Extract elisa
run: |
Expand Down
2 changes: 1 addition & 1 deletion bin/alisa/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/chipp/build.rust.x86_64_musl:1.75.0_1 AS builder
FROM ghcr.io/chipp/build.rust.arm64_musl:1.76.0_1 AS builder

WORKDIR /home/rust/src
RUN USER=rust \
Expand Down
2 changes: 1 addition & 1 deletion bin/alisa/test.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/chipp/build.rust.x86_64_musl:1.75.0_1 AS builder
FROM ghcr.io/chipp/build.rust.x86_64_musl:1.76.0_1 AS builder

WORKDIR /home/rust/src
RUN USER=rust \
Expand Down
2 changes: 1 addition & 1 deletion bin/elisa/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/chipp/build.rust.arm64_musl:1.75.0_1 AS builder
FROM ghcr.io/chipp/build.rust.arm64_musl:1.76.0_1 AS builder

WORKDIR /home/rust/src
RUN USER=rust \
Expand Down
2 changes: 1 addition & 1 deletion bin/elisa/test.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/chipp/build.rust.x86_64_musl:1.75.0_1 AS builder
FROM ghcr.io/chipp/build.rust.x86_64_musl:1.76.0_1 AS builder

WORKDIR /home/rust/src
RUN USER=rust \
Expand Down
2 changes: 1 addition & 1 deletion bin/elizabeth/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/chipp/build.rust.x86_64_musl:1.75.0_1 AS builder
FROM ghcr.io/chipp/build.rust.arm64_musl:1.76.0_1 AS builder

WORKDIR /home/rust/src
RUN USER=rust \
Expand Down
2 changes: 1 addition & 1 deletion bin/elizabeth/test.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/chipp/build.rust.x86_64_musl:1.75.0_1 AS builder
FROM ghcr.io/chipp/build.rust.x86_64_musl:1.76.0_1 AS builder

WORKDIR /home/rust/src
RUN USER=rust \
Expand Down
4 changes: 2 additions & 2 deletions bin/isabel/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
FROM ghcr.io/chipp/build.rust.arm64_musl:1.75.0_1 as libs_builder
FROM ghcr.io/chipp/build.rust.arm64_musl:1.76.0_1 as libs_builder

COPY ./bin/isabel/install_static_libs.sh ./install_static_libs.sh
RUN chmod +x ./install_static_libs.sh && \
./install_static_libs.sh && \
rm ./install_static_libs.sh

FROM ghcr.io/chipp/build.rust.arm64_musl:1.75.0_1 AS builder
FROM ghcr.io/chipp/build.rust.arm64_musl:1.76.0_1 AS builder

COPY --from=0 $PREFIX $PREFIX

Expand Down
4 changes: 2 additions & 2 deletions bin/isabel/test.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
FROM ghcr.io/chipp/build.rust.x86_64_musl:1.75.0_1 as libs_builder
FROM ghcr.io/chipp/build.rust.x86_64_musl:1.76.0_1 as libs_builder

COPY ./bin/isabel/install_static_libs.sh ./install_static_libs.sh
RUN chmod +x ./install_static_libs.sh && \
./install_static_libs.sh && \
rm ./install_static_libs.sh

FROM ghcr.io/chipp/build.rust.x86_64_musl:1.75.0_1 AS builder
FROM ghcr.io/chipp/build.rust.x86_64_musl:1.76.0_1 AS builder

COPY --from=0 $PREFIX $PREFIX

Expand Down

0 comments on commit 641a488

Please sign in to comment.