Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] main from sozu-proxy:main #84

Merged
merged 7 commits into from
Dec 26, 2024
Merged

[pull] main from sozu-proxy:main #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
93a4ea4
build: fix dockerfile
anonkey Dec 26, 2024
e89e1a4
docs: fix query commands
anonkey Dec 26, 2024
8bc671d
Merge pull request #1163 from anonkey/fix-docker-build
FlorentinDUBOIS Dec 26, 2024
a62e2f1
Merge pull request #1164 from anonkey/fix-query-commands-docs
FlorentinDUBOIS Dec 26, 2024
a77c928
ci(docker): build and push on every commits
FlorentinDUBOIS Dec 26, 2024
f2c4d65
Merge pull request #1166 from sozu-proxy/devel/fdubois/ci/docker
FlorentinDUBOIS Dec 26, 2024
ebdda47
chore: remove @keksoj from code owners
FlorentinDUBOIS Dec 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 8 additions & 9 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- name: install protoc
run: sudo apt-get update && sudo apt-get install -y protobuf-compiler
- name: Checkout sources
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: Install rust (${{ matrix.rust }})
uses: actions-rs/toolchain@v1
with:
Expand All @@ -43,7 +43,7 @@ jobs:
- name: install protoc
run: sudo apt-get update && sudo apt-get install -y protobuf-compiler
- name: Checkout sources
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: Install rust
uses: actions-rs/toolchain@v1
with:
Expand All @@ -62,7 +62,7 @@ jobs:
- name: install protoc
run: sudo apt-get update && sudo apt-get install -y protobuf-compiler
- name: Checkout sources
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: Install rust
uses: actions-rs/toolchain@v1
with:
Expand All @@ -84,16 +84,15 @@ jobs:
dockerhub:
name: Docker build and push to Docker Hub
runs-on: ubuntu-latest
if: github.ref == 'refs/heads/main'
steps:
- uses: actions/checkout@v2
- uses: docker/setup-qemu-action@v1
- uses: docker/setup-buildx-action@v1
- uses: docker/login-action@v1
- uses: actions/checkout@v4
- uses: docker/setup-qemu-action@v3
- uses: docker/setup-buildx-action@v3
- uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- uses: docker/build-push-action@v2
- uses: docker/build-push-action@v6
with:
context: .
push: 'true'
Expand Down
2 changes: 1 addition & 1 deletion CODEOWNERS
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# Code owners of Sōzu
* @FlorentinDUBOIS @Keksoj @Wonshtrum @llenotre
* @FlorentinDUBOIS @Wonshtrum @llenotre
178 changes: 2 additions & 176 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 2 additions & 3 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ RUN apk add --no-cache llvm-libunwind \
COPY . /usr/src/sozu
WORKDIR /usr/src/sozu

RUN cargo vendor --locked
RUN mkdir .cargo
RUN cargo vendor --locked >.cargo/config.toml
RUN cargo build --release --frozen

FROM alpine:$ALPINE_VERSION as bin
Expand All @@ -38,8 +39,6 @@ RUN apk update && apk add --no-cache \

COPY --from=builder /usr/src/sozu/target/release/sozu /usr/local/bin/sozu
COPY os-build/config.toml /etc/sozu/config.toml
COPY lib/assets/404.html /etc/sozu/html/404.html
COPY lib/assets/503.html /etc/sozu/html/503.html

ENTRYPOINT ["/usr/local/bin/sozu"]
CMD ["start", "-c", "/etc/sozu/config.toml"]
Loading
Loading