Skip to content

Commit 7669398

Browse files
authored
Merge pull request #867 from Kixiron/docker-fail
Fixed docker test failure
2 parents c547669 + 0408796 commit 7669398

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

dockerfiles/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ FROM ubuntu:bionic AS build
1313

1414
# Install packaged dependencies
1515
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
16-
build-essential git curl cmake gcc g++ pkg-config libmagic-dev \
17-
libssl-dev zlib1g-dev ca-certificates
16+
build-essential git curl cmake gcc g++ pkg-config libmagic-dev \
17+
libssl-dev zlib1g-dev ca-certificates
1818

1919
# Install the stable toolchain with rustup
2020
RUN curl https://static.rust-lang.org/rustup/dist/x86_64-unknown-linux-gnu/rustup-init >/tmp/rustup-init && \
@@ -74,7 +74,7 @@ RUN mkdir -p /opt/docsrs/prefix
7474
COPY --from=build /build/target/release/cratesfyi /usr/local/bin
7575
COPY static /opt/docsrs/prefix/public_html
7676
COPY templates /opt/docsrs/templates
77-
COPY docker/entrypoint.sh /opt/docsrs/
77+
COPY dockerfiles/entrypoint.sh /opt/docsrs/
7878

7979
WORKDIR /opt/docsrs
8080
ENTRYPOINT ["/opt/docsrs/entrypoint.sh"]

dockerfiles/prometheus.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
global:
2-
scrape_interval: 15s # By default, scrape targets every 15 seconds.
2+
scrape_interval: 15s # By default, scrape targets every 15 seconds.
33

44
# Attach these labels to any time series or alerts when communicating with
55
# external systems (federation, remote storage, Alertmanager).
66
external_labels:
7-
monitor: 'docs.rs-monitor'
7+
monitor: "docs.rs-monitor"
88

99
scrape_configs:
1010
# The job name is added as a label `job=<job_name>` to any timeseries scraped from this config.
11-
- job_name: 'docs.rs'
12-
metrics_path: '/about/metrics'
11+
- job_name: "docs.rs"
12+
metrics_path: "/about/metrics"
1313
static_configs:
14-
- targets: ['web:3000']
14+
- targets: ["web:3000"]

0 commit comments

Comments
 (0)