v0.0.7

Author: cylonchau

Dockerfile

@@ -10,33 +10,13 @@ RUN \
     upx -1 _output/firewalld-gateway && \
     chmod +x _output/firewalld-gateway
 
-FROM nginx:1.20 AS runner
+FROM alpine AS runner
 WORKDIR /uranus
-ARG S6_OVERLAY_VERSION=3.1.5.0
-ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-noarch.tar.xz /tmp
-ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-x86_64.tar.xz /tmp
-
-RUN apt update && apt install xz-utils procps iproute2 -y && \
-    tar -Jxpf /tmp/s6-overlay-x86_64.tar.xz -C / && \
-    tar -Jxpf /tmp/s6-overlay-noarch.tar.xz -C / && \
-    rm -f /tmp/s6-overlay-x86_64.tar.xz && \
-    rm -f /tmp/s6-overlay-noarch.tar.xz
-ENTRYPOINT ["/init"]
-RUN mkdir /etc/services.d/
+ENV PATH="/uranus/bin:$PATH"
 COPY --from=builder /uranus/_output/firewalld-gateway ./bin/
 COPY --from=builder /uranus/firewalld-gateway.toml .
-COPY --from=builder /uranus/dist /var/run/dist/
-COPY --from=builder /uranus/uranus.nginx-2953.conf /etc/nginx/conf.d/fw.conf
-COPY --from=builder /uranus/s6/ /etc/s6-overlay/s6-rc.d/
-COPY --from=builder /uranus/s6/ /etc/services.d/
-ENV PATH "$PATH:/uranus/bin"
-RUN  firewalld-gateway --sql-driver=sqlite --migration && \
-     rm -f /etc/nginx/conf.d/default.conf && \
-     echo "longrun" > /etc/s6-overlay/s6-rc.d/nginx/type && \
-     echo "longrun" > /etc/s6-overlay/s6-rc.d/uranus/type && \
-     mkdir -pv /etc/s6-overlay/s6-rc.d/uranus/contents.d && \
-     mkdir -pv /etc/s6-overlay/s6-rc.d/nginx/contents.d
-
-#CMD [ " /command/s6-svscan", "/etc/services.d" ]
+RUN firewalld-gateway --sql-driver=sqlite --migration
 VOLUME ["/uranus" ]
-EXPOSE 2953/tcp
+ENV PATH="/uranus/bin:${PATH}"
+CMD ["firewalld-gateway", "--sql-driver=sqlite", "--config", "firewalld-gateway.toml", "-v", "10"]
+EXPOSE 2952/tcp

Dockerfile_with_nginx

@@ -0,0 +1,42 @@
+FROM golang:alpine AS builder
+MAINTAINER cylon
+WORKDIR /uranus
+COPY ./ /uranus
+ENV GOPROXY https://goproxy.cn,direct
+RUN \
+    #sed -i 's/dl-cdn.alpinelinux.org/mirrors.ustc.edu.cn/g' /etc/apk/repositories && \
+    apk add upx bash make && \
+    make build && \
+    upx -1 _output/firewalld-gateway && \
+    chmod +x _output/firewalld-gateway
+
+FROM nginx:1.20 AS runner
+WORKDIR /uranus
+ARG S6_OVERLAY_VERSION=3.1.5.0
+ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-noarch.tar.xz /tmp
+ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-x86_64.tar.xz /tmp
+
+RUN apt update && apt install xz-utils procps iproute2 -y && \
+    tar -Jxpf /tmp/s6-overlay-x86_64.tar.xz -C / && \
+    tar -Jxpf /tmp/s6-overlay-noarch.tar.xz -C / && \
+    rm -f /tmp/s6-overlay-x86_64.tar.xz && \
+    rm -f /tmp/s6-overlay-noarch.tar.xz
+ENTRYPOINT ["/init"]
+RUN mkdir /etc/services.d/
+COPY --from=builder /uranus/_output/firewalld-gateway ./bin/
+COPY --from=builder /uranus/firewalld-gateway.toml .
+COPY --from=builder /uranus/dist /var/run/dist/
+COPY --from=builder /uranus/uranus.nginx-2953.conf /etc/nginx/conf.d/fw.conf
+COPY --from=builder /uranus/s6/ /etc/s6-overlay/s6-rc.d/
+COPY --from=builder /uranus/s6/ /etc/services.d/
+ENV PATH "$PATH:/uranus/bin"
+RUN  firewalld-gateway --sql-driver=sqlite --migration && \
+     rm -f /etc/nginx/conf.d/default.conf && \
+     echo "longrun" > /etc/s6-overlay/s6-rc.d/nginx/type && \
+     echo "longrun" > /etc/s6-overlay/s6-rc.d/uranus/type && \
+     mkdir -pv /etc/s6-overlay/s6-rc.d/uranus/contents.d && \
+     mkdir -pv /etc/s6-overlay/s6-rc.d/nginx/contents.d
+
+#CMD [ " /command/s6-svscan", "/etc/services.d" ]
+VOLUME ["/uranus" ]
+EXPOSE 2953/tcp

api/api.go

@@ -47,7 +47,6 @@ const (
 	ZONE_ADDPROTOCOL       = ZONE + ".addProtocol"
 	ZONE_ADDRICHRULE       = ZONE + ".addRichRule"
 	ZONE_ADDSERVICE        = ZONE + ".addService"
-	ZONE_GETSERVICES       = ZONE + ".getServices"
 	ZONE_ADDSOURCE         = ZONE + ".addSource"
 	ZONE_ADDINTERFACE      = ZONE + ".addInterface"
 	ZONE_QUERYINTERFACE    = ZONE + ".queryInterface"
@@ -66,6 +65,7 @@ const (
 	ZONE_QUERYRICHRULE      = ZONE + ".queryRichRule"
 	ZONE_QUERYSERVICE       = ZONE + ".queryService"
 	ZONE_REMOVESERVICE      = ZONE + ".removeService"
+	ZONE_GETSERVICES        = ZONE + ".getServices"
 
 	// org.fedoraproject.FirewallD1.config
 	CONFIG_ADDZONE = CONFIG_INTERFACE + ".addZone"

cmd/main.go

@@ -14,15 +14,15 @@ import (
 
 // @title Uranus API
 // @version 1.0
-// @description Uranus, distrubed firewall gateway
+// @description Uranus, distrubed firewall gateway.
 
 // @securityDefinitions.apikey Bearer
 // @in header
 // @name Authorization
 // @description Type "Bearer" followed by a space and JWT token.
 
 // @host localhost:2952
-// @BasePath /
+// @BasePath /server
 // @schemes http
 func main() {
 	command := server.NewProxyCommand()