Skip to content

Commit

Permalink
fix docker file
Browse files Browse the repository at this point in the history
  • Loading branch information
legokichi committed May 8, 2023
1 parent c2e82b4 commit 1aff54f
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ commands:
jobs:
build:
docker:
- image: cimg/rust:1.50.0
- image: cimg/rust:1.67.1
environment:
RUST_BACKTRACE: 1
CARGO_HOME: /home/circleci/.cargo
Expand Down
10 changes: 5 additions & 5 deletions Dockerfile.x86_64
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
FROM ekidd/rust-musl-builder:1.50.0 AS builder
FROM rust:1.67.1 AS builder

COPY src src
COPY rust-toolchain .
COPY Cargo.toml .
COPY Cargo.lock .

RUN cargo build --release && \
strip /home/rust/src/target/x86_64-unknown-linux-musl/release/gatekeeperd
RUN cargo build --release
RUN strip /target/release/gatekeeperd

FROM scratch
FROM rust:1.67.1

COPY --from=builder /home/rust/src/target/x86_64-unknown-linux-musl/release/gatekeeperd /
COPY --from=builder /target/release/gatekeeperd /

EXPOSE 1080

Expand Down
1 change: 1 addition & 0 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ pub mod server;
pub mod server_command;
mod session;
mod tcp_listener_ext;
#[cfg(test)]
mod test;
mod thread;

Expand Down
4 changes: 1 addition & 3 deletions src/test.rs
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
#![cfg(test)]
use std::path::PathBuf;

#[test]
#[ignore]
fn get_main() {
use std::io::prelude::*;
use std::path::PathBuf;

use log::*;
use regex::Regex;
Expand Down

0 comments on commit 1aff54f

Please sign in to comment.