Fix ci
This commit is contained in:
@@ -11,3 +11,4 @@ docker-compose*
|
|||||||
README.md
|
README.md
|
||||||
LICENSE
|
LICENSE
|
||||||
.vscode
|
.vscode
|
||||||
|
*.debug.yml
|
||||||
@@ -1,7 +1,9 @@
|
|||||||
|
language: go
|
||||||
|
|
||||||
services:
|
services:
|
||||||
- docker
|
- docker
|
||||||
|
|
||||||
install: "docker build -t walawala:latest -t walawala:latest ."
|
install: "docker build -t opencv:latest -t opencv:latest ."
|
||||||
|
|
||||||
after_success:
|
after_success:
|
||||||
- docker login -u"$DOCKERHUB_USERNAME" -p"$DOCKERHUB_PASSWORD"
|
- docker login -u"$DOCKERHUB_USERNAME" -p"$DOCKERHUB_PASSWORD"
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
|
|
||||||
FROM golang:1.12-alpine3.10 as builder
|
FROM golang:latest as builder
|
||||||
|
|
||||||
LABEL maintainer="kaiiak,aNxFi37X@outlook.com"
|
LABEL maintainer="kaiiak,aNxFi37X@outlook.com"
|
||||||
|
|
||||||
@@ -36,10 +36,10 @@ RUN curl -Lo opencv.zip https://github.com/opencv/opencv/archive/${OPENCV_VERSIO
|
|||||||
make preinstall && make install && \
|
make preinstall && make install && \
|
||||||
cd /go && rm -rf opencv*
|
cd /go && rm -rf opencv*
|
||||||
|
|
||||||
FROM golang:1.12-alpine3.10
|
FROM golang:latest
|
||||||
|
|
||||||
#final stage
|
#final stage
|
||||||
FROM golang:1.12-alpine3.10 as opencv
|
FROM golang:latest as opencv
|
||||||
RUN apk --no-cache add ca-certificates gcc
|
RUN apk --no-cache add ca-certificates gcc
|
||||||
COPY --from=builder /usr/local/lib64 /usr/local/lib64
|
COPY --from=builder /usr/local/lib64 /usr/local/lib64
|
||||||
LABEL maintainer="kaiiak,aNxFi37X@outlook.com"
|
LABEL maintainer="kaiiak,aNxFi37X@outlook.com"
|
||||||
|
|||||||
@@ -1,8 +0,0 @@
|
|||||||
version: '2.1'
|
|
||||||
|
|
||||||
services:
|
|
||||||
opencv-docker-golang:
|
|
||||||
image: opencv-docker-golang
|
|
||||||
build:
|
|
||||||
context: .
|
|
||||||
dockerfile: Dockerfile
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
version: '2.1'
|
|
||||||
|
|
||||||
services:
|
|
||||||
opencv-docker-golang:
|
|
||||||
image: opencv-docker-golang
|
|
||||||
build: .
|
|
||||||
ports:
|
|
||||||
- :
|
|
||||||
Reference in New Issue
Block a user