Skip to content

Commit

Permalink
starts rework
Browse files Browse the repository at this point in the history
  • Loading branch information
Carsten König committed Nov 28, 2024
1 parent 1dfa94f commit ebee9dd
Show file tree
Hide file tree
Showing 12 changed files with 319 additions and 39 deletions.
183 changes: 183 additions & 0 deletions Cargo.lock

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

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ axum = "0.7.7"
tokio = { version = "1.0", features = ["full"] }
serde = "1.0"
serde_json = "1.0"
bollard = "0.17"
bollard = { version = "0.17", features= ["ssl"] }
futures = "0.3.31"
futures-core = "0.3.31"
futures-util = "0.3.31"
Expand Down
9 changes: 9 additions & 0 deletions Dockerfile.test
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
FROM rust:slim AS builder

WORKDIR /usr/src

RUN USER=root cargo new autodok
RUN rustup target add x86_64-unknown-linux-musl
COPY Cargo.toml Cargo.lock /usr/src/autodok/
WORKDIR /usr/src/autodok
RUN cargo test
15 changes: 15 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,18 @@ docker_push:
docker push cars10/autodok:latest

prod: docker_build docker_push


### Tests

build_test:
docker compose -f compose.test.yml build test

test: _start_test_docker_server
docker compose -f compose.test.yml run --rm test cargo test -- --nocapture

test_bash: _start_test_docker_server
docker compose -f compose.test.yml run --rm -it test bash

_start_test_docker_server:
docker compose -f compose.test.yml up -d --remove-orphans server
36 changes: 36 additions & 0 deletions compose.test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
services:
server:
image: docker:latest
container_name: docker_server
privileged: true
environment:
- DOCKER_TLS_CERTDIR=/certs
volumes:
- docker_certs_ca:/certs/ca
- docker_certs_client:/certs/client
networks:
docker_network:
aliases:
- docker

test:
build:
context: .
dockerfile: Dockerfile.test
environment:
DOCKER_HOST: https://docker:2376
depends_on:
- server
volumes:
- docker_certs_client:/certs/client:ro
- ./src/:/usr/src/autodok/src
- ./tests/:/usr/src/autodok/tests
networks:
- docker_network

volumes:
docker_certs_ca:
docker_certs_client:

networks:
docker_network:
9 changes: 0 additions & 9 deletions diesel.toml

This file was deleted.

Loading

0 comments on commit ebee9dd

Please sign in to comment.