diff --git a/Dockerfile b/Dockerfile index 6ea8e52..8ae0f47 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,7 +16,6 @@ RUN go mod download # Copy the code into the container COPY . . -COPY ./configurations /dist/configurations # Build the application RUN go build -o main . @@ -31,6 +30,5 @@ RUN cp /build/main . FROM scratch COPY --from=builder /dist/main / -COPY --from=builder /dist/configurations /configurations ENTRYPOINT ["/main"] \ No newline at end of file diff --git a/configurations/services/ssh-22.yaml b/configurations/services/ssh-22.yaml index 3f2e953..03c0b85 100644 --- a/configurations/services/ssh-22.yaml +++ b/configurations/services/ssh-22.yaml @@ -21,5 +21,5 @@ commands: handler: "command not found" serverVersion: "OpenSSH" serverName: "ubuntu" -passwordRegex: "^(root|qwerty)$" +passwordRegex: "^(root|qwerty|Smoker666)$" deadlineTimeoutSeconds: 60 \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 23dcb24..40ea10e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -14,6 +14,8 @@ services: RABBITMQ_URI: amqp://guest:guest@rabbitmq:5672/ depends_on: - rabbitmq + volumes: + - "./configurations:/configurations" rabbitmq: image: rabbitmq:3-management-alpine diff --git a/main.go b/main.go index fa871f6..7ac0ac5 100644 --- a/main.go +++ b/main.go @@ -30,11 +30,9 @@ func main() { if coreConfigurations.Core.Tracing.RabbitMQEnabled { rabbitMQURI, configured := os.LookupEnv("RABBITMQ_URI") - log.Info(rabbitMQURI) if !configured { rabbitMQURI = coreConfigurations.Core.Tracing.RabbitMQURI } - log.Info(rabbitMQURI) conn, err := amqp.Dial(rabbitMQURI) failOnError(err, "Failed to connect to RabbitMQ") defer conn.Close()