Merge pull request 'Add complement support for CI' (#209) from valkum/complement into master
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/209
This commit is contained in:
		
						commit
						a89f7eaf9f
					
				
					 7 changed files with 31 additions and 2 deletions
				
			
		|  | @ -1,6 +1,6 @@ | ||||||
| # Local build and dev artifacts | # Local build and dev artifacts | ||||||
| target | target | ||||||
| sytest | tests | ||||||
| 
 | 
 | ||||||
| # Docker files | # Docker files | ||||||
| Dockerfile* | Dockerfile* | ||||||
|  | @ -21,7 +21,6 @@ docker-compose* | ||||||
| 
 | 
 | ||||||
| # Toml files | # Toml files | ||||||
| rustfmt.toml | rustfmt.toml | ||||||
| Rocket-example.toml |  | ||||||
| 
 | 
 | ||||||
| # Documentation | # Documentation | ||||||
| *.md | *.md | ||||||
|  |  | ||||||
							
								
								
									
										30
									
								
								tests/Complement.Dockerfile
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										30
									
								
								tests/Complement.Dockerfile
									
									
									
									
									
										Normal file
									
								
							|  | @ -0,0 +1,30 @@ | ||||||
|  | FROM valkum/docker-rust-ci:latest as builder | ||||||
|  | WORKDIR /workdir | ||||||
|  | 
 | ||||||
|  | ARG RUSTC_WRAPPER | ||||||
|  | ARG AWS_ACCESS_KEY_ID | ||||||
|  | ARG AWS_SECRET_ACCESS_KEY | ||||||
|  | ARG SCCACHE_BUCKET | ||||||
|  | ARG SCCACHE_ENDPOINT | ||||||
|  | ARG SCCACHE_S3_USE_SSL | ||||||
|  | 
 | ||||||
|  | COPY . . | ||||||
|  | RUN cargo build | ||||||
|  | 
 | ||||||
|  | FROM valkum/docker-rust-ci:latest | ||||||
|  | WORKDIR /workdir | ||||||
|  | 
 | ||||||
|  | RUN curl -OL "https://github.com/caddyserver/caddy/releases/download/v2.1.1/caddy_2.1.1_linux_amd64.tar.gz" | ||||||
|  | RUN tar xzf caddy_2.1.1_linux_amd64.tar.gz | ||||||
|  | 
 | ||||||
|  | COPY --from=builder /workdir/target/debug/conduit /workdir/conduit | ||||||
|  | 
 | ||||||
|  | COPY Rocket-example.toml Rocket.toml | ||||||
|  | 
 | ||||||
|  | ENV SERVER_NAME=localhost | ||||||
|  | 
 | ||||||
|  | RUN sed -i "s/server_name = \"your.server.name\"/server_name = \"${SERVER_NAME}\"/g" Rocket.toml | ||||||
|  | RUN sed -i "s/port = 14004/port = 8008/g" Rocket.toml | ||||||
|  | 
 | ||||||
|  | EXPOSE 8008 8448 | ||||||
|  | CMD /workdir/caddy reverse-proxy --from ${SERVER_NAME}:8448 --to localhost:8008 > /dev/null 2>&1 & /workdir/conduit | ||||||
		Loading…
	
		Reference in a new issue