Skip to content

Commit

Permalink
依赖
Browse files Browse the repository at this point in the history
  • Loading branch information
togettoyou committed Jan 23, 2025
1 parent fa02f7d commit d849342
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 14 deletions.
11 changes: 5 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
FROM golang:1.16 AS builder-server
RUN apt-get update && apt-get install -y \
git make gcc \
&& rm -rf /var/lib/apt/lists/*
ENV GO111MODULE=on \
GOPROXY=https://goproxy.cn,direct
COPY server/. /root/togettoyou/
WORKDIR /root/togettoyou/
RUN make
Expand All @@ -17,11 +12,15 @@ RUN yarn run build:prod

FROM togettoyou/zsign:latest AS zsign

FROM centos:8
FROM centos:7
COPY --from=builder-server /root/togettoyou/ipashare ./
COPY --from=builder-server /root/togettoyou/conf/ ./conf/
COPY --from=builder-web /app/dist/ ./dist/
COPY --from=zsign /zsign/zsign /bin/zsign
RUN sed -i 's|mirrorlist=http://mirrorlist.centos.org|#mirrorlist=http://mirrorlist.centos.org|' /etc/yum.repos.d/CentOS-Base.repo && \
sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://mirrors.aliyun.com|' /etc/yum.repos.d/CentOS-Base.repo && \
yum clean all && \
yum makecache
RUN yum install -y openssl openssl-devel unzip zip
WORKDIR /root/togettoyou/
ENTRYPOINT ["./ipashare"]
11 changes: 5 additions & 6 deletions server/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,19 +1,18 @@
FROM golang:1.16 AS builder
RUN apt-get update && apt-get install -y \
git make gcc \
&& rm -rf /var/lib/apt/lists/*
ENV GO111MODULE=on \
GOPROXY=https://goproxy.cn,direct
COPY . /root/togettoyou/
WORKDIR /root/togettoyou/
RUN make

FROM togettoyou/zsign:latest AS zsign

FROM centos:8
FROM centos:7
COPY --from=builder /root/togettoyou/ipashare /root/togettoyou/
COPY --from=builder /root/togettoyou/conf/ /root/togettoyou/conf/
COPY --from=zsign /zsign/zsign /bin/zsign
RUN sed -i 's|mirrorlist=http://mirrorlist.centos.org|#mirrorlist=http://mirrorlist.centos.org|' /etc/yum.repos.d/CentOS-Base.repo && \
sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://mirrors.aliyun.com|' /etc/yum.repos.d/CentOS-Base.repo && \
yum clean all && \
yum makecache
RUN yum install -y openssl openssl-devel unzip zip
WORKDIR /root/togettoyou/
ENTRYPOINT ["./ipashare"]
4 changes: 2 additions & 2 deletions server/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ TARGET=$(out)

# 执行make命令时所执行的所有命令
all: clean
go build -v -o ${BINARY_NAME} -mod=vendor cmd/server/main.go
go build -ldflags '-extldflags "-static"' -v -o ${BINARY_NAME} -mod=vendor cmd/server/main.go

docs: clean
go build -tags "docs" -v -o ${BINARY_NAME} -mod=vendor cmd/server/main.go
go build -ldflags '-extldflags "-static"' -tags "docs" -v -o ${BINARY_NAME} -mod=vendor cmd/server/main.go

# 交叉编译linux amd64版本
linux: clean
Expand Down

0 comments on commit d849342

Please sign in to comment.