Skip to content

Commit

Permalink
Merge pull request #108 from dz3n/docker_api
Browse files Browse the repository at this point in the history
Change Docker API
  • Loading branch information
aacebedo authored Jan 22, 2024
2 parents 1b558dc + 2f62930 commit 2979e32
Show file tree
Hide file tree
Showing 4 changed files with 50 additions and 50 deletions.
49 changes: 0 additions & 49 deletions .travis.yml

This file was deleted.

44 changes: 44 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
FROM alpine:3.6 AS builder

ARG GOLANG_VERSION=1.8.4-r0

RUN apk update
RUN apk add go=${GOLANG_VERSION} go-tools=${GOLANG_VERSION} git musl-dev
RUN go version

ENV GOPATH=/go
ENV PATH=${PATH}:/go/bin
ENV CGO_ENABLED=0

RUN go get -v github.com/tools/godep
# RUN go get -u github.com/golang/lint/golint
RUN go get github.com/ahmetb/govvv

RUN mkdir -p /go/src/github.com/aacebedo/dnsdock

WORKDIR /go/src/github.com/aacebedo/dnsdock

RUN git clone https://github.com/aacebedo/dnsdock /go/src/github.com/aacebedo/dnsdock
# RUN git checkout {{$GIT_COMMIT}}

RUN mkdir /tmp/output

WORKDIR /go/src/github.com/aacebedo/dnsdock

ENV GIT_SSL_NO_VERIFY=true

RUN godep restore

ENV GOARCH=amd64

WORKDIR /go/src/github.com/aacebedo/dnsdock/src

RUN govvv build -o /tmp/output/dnsdock

FROM alpine:3.18.2

ENV GOARCH=amd64

COPY --from=builder /tmp/output/dnsdock /bin/dnsdock

ENTRYPOINT ["dnsdock"]
5 changes: 5 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
build:
docker build -t dnsdock:latest .

build-test:
docker build -t dnsdock:test . --progress=plain --no-cache
2 changes: 1 addition & 1 deletion src/core/docker.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ type DockerManager struct {
// NewDockerManager creates a new DockerManager
func NewDockerManager(c *utils.Config, list servers.ServiceListProvider, tlsConfig *tls.Config) (*DockerManager, error) {
defaultHeaders := map[string]string{"User-Agent": "engine-api-cli-1.0"}
dclient, err := client.NewClient(c.DockerHost, "v1.22", nil, defaultHeaders)
dclient, err := client.NewClient(c.DockerHost, "v1.44", nil, defaultHeaders)

if err != nil {
return nil, err
Expand Down

0 comments on commit 2979e32

Please sign in to comment.