1
0

feat: 将sshsvc移除

This commit is contained in:
TsMask
2025-07-16 15:46:20 +08:00
parent 6ab25532e5
commit f925645b88
14 changed files with 11 additions and 63 deletions

View File

@@ -36,10 +36,6 @@ RUN cd /api && go build -o omc -v -ldflags "-s -w \
-X 'be.ems/src/framework/config.Version=$VERSION' \
-X 'be.ems/src/framework/config.BuildTime=$(date)' \
-X 'be.ems/src/framework/config.GoVer=$(go version)'"
# RUN cd /api/sshsvc && go build -o sshsvc -v -ldflags "-s -w \
# -X 'be.ems/lib/global.Version=$VERSION' \
# -X 'be.ems/lib/global.BuildTime=$(date)' \
# -X 'be.ems/lib/global.GoVer=$(go version)'"
## 第三阶段 ====> 构建前后端融合镜像
@@ -49,7 +45,6 @@ FROM alpine:3.20
COPY --from=build-golang /linux/usr/local/etc/omc /usr/local/etc/omc
COPY --from=build-golang /linux/usr/local/omc /usr/local/omc
COPY --from=build-golang /api/omc /usr/local/bin/omc
# COPY --from=build-golang /api/sshsvc/sshsvc /usr/local/bin/sshsvc
COPY --from=build-golang /web /usr/local/etc/omc/web
# 更新apt并安装必要工具

View File

@@ -42,10 +42,6 @@ RUN cd /api && go build -o omc -v -ldflags "-s -w \
-X 'be.ems/src/framework/config.Version=$VERSION' \
-X 'be.ems/src/framework/config.BuildTime=$(date)' \
-X 'be.ems/src/framework/config.GoVer=$(go version)'"
# RUN cd /api/sshsvc && go build -o sshsvc -v -ldflags "-s -w \
# -X 'be.ems/lib/global.Version=$VERSION' \
# -X 'be.ems/lib/global.BuildTime=$(date)' \
# -X 'be.ems/lib/global.GoVer=$(go version)'"
## 第三阶段 ====> 构建前后端融合镜像
@@ -55,7 +51,6 @@ FROM ubuntu:22.04
COPY --from=build-golang /linux/usr/local/etc/omc /usr/local/etc/omc
COPY --from=build-golang /linux/usr/local/omc /usr/local/omc
COPY --from=build-golang /api/omc /usr/local/bin/omc
# COPY --from=build-golang /api/sshsvc/sshsvc /usr/local/bin/sshsvc
COPY --from=build-golang /web /usr/local/etc/omc/web
# 更新apt并安装必要工具

View File

@@ -13,7 +13,6 @@ set -o pipefail
# case someone mounts a configuration file in /usr/local/etc/omc/default)
cp -n $BASE_DIR/default/omc.conf $BASE_DIR/omc.conf
cp -n $BASE_DIR/default/omc.yaml $BASE_DIR/omc.yaml
# cp -n $BASE_DIR/default/sshsvc.yaml $BASE_DIR/sshsvc.yaml
# Initialize OMC DB
if [ ! -f /usr/local/etc/omc/machine.ini ]; then

View File

@@ -17,11 +17,10 @@ chmod +rx /usr/local/bin/omc
# case someone mounts a configuration file in /usr/local/etc/omc/default)
cp $BASE_DIR/default/omc.conf $BASE_DIR/omc.conf
cp $BASE_DIR/default/omc.yaml $BASE_DIR/omc.yaml
# cp $BASE_DIR/default/sshsvc.yaml $BASE_DIR/sshsvc.yaml
# OMC config
sed -i "s/port: 33030 # http listen port/port: $API_HTTP_PORT # http listen port/" "$BASE_DIR"/omc.yaml
sed -i "s/port: 33443 # https listen port/port: $API_HTTPS_PORT # https listen port/" "$BASE_DIR"/omc.yaml
sed -i "s/addr: "0.0.0.0:33030" # route http port/addr: "0.0.0.0:$API_HTTP_PORT" # route http port/" "$BASE_DIR"/omc.yaml
sed -i "s/addr: "0.0.0.0:33443" # route https port/addr: "0.0.0.0:$API_HTTPS_PORT" # route https port/" "$BASE_DIR"/omc.yaml
sed -i 's/enabled: true # web server enabled/enabled: false # web server enabled/' "$BASE_DIR"/omc.yaml
sed -i 's/host: "127.0.0.1" # mysql host$/host: "omc_mariadb" # mysql host/' "$BASE_DIR"/omc.yaml
sed -i 's/port: 33066 # mysql port$/port: 3306 # mysql port/' "$BASE_DIR"/omc.yaml