Merge branch 'version-1.1.0' of https://github.com/KaySar12/1Panel in…

…to version-1.1.0
KaySar12 · Oct 23, 2024 · a15cdb8 · a15cdb8
2 parents 61a28f4 + 79e189a
commit a15cdb8
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -21,6 +21,7 @@ IMAGE_TAG=1.1
 DOCKER_USERNAME=kaysar12
 ASSERT_PATH= $(BASE_PATH)/cmd/server/web/assets
 DETACH ?= false
+NEXTZEN_REGISTRY=hub.c14soft.com
 clean_assets:
 	rm -rf $(ASSERT_PATH) &&\
     if [ -f "$(DEPLOY_PATH)/$(APP_NAME)" ]; then \
@@ -51,6 +52,14 @@ build_image:
 	cp $(BUILD_PATH)/$(APP_NAME) $(DEPLOY_PATH) && \
 	cd $(DEPLOY_PATH) && \
 	$(DOCKERBUILD) --build-arg PANELVER=$(APP_VERSION) -t ${DOCKER_USERNAME}/$(APP_NAME):$(IMAGE_TAG) .
+build_image_nextzen:
+	if [ ! -f "$(BUILD_PATH)/$(APP_NAME)" ]; then \
+		echo "Error: $(APP_NAME) does not exist in $(BUILD_PATH)"; \
+		exit 1; \
+	fi
+	cp $(BUILD_PATH)/$(APP_NAME) $(DEPLOY_PATH) && \
+	cd $(DEPLOY_PATH) && \
+	$(DOCKERBUILD) --build-arg PANELVER=$(APP_VERSION) -t ${NEXTZEN_REGISTRY}/${NEXTZEN_ORG}/$(APP_NAME):$(IMAGE_TAG) .
 remove_image:
 	@if [ -n "$(shell $(DOCKERIMAGE) ls -q "${DOCKER_USERNAME}/${APP_NAME}:${IMAGE_TAG}")" ]; then \
 		$(DOCKERIMAGE) rm ${DOCKER_USERNAME}/$(APP_NAME):$(IMAGE_TAG); \
@@ -59,6 +68,8 @@ remove_image:
 	fi
 push_image:
 	$(DOCKERPUSH) ${DOCKER_USERNAME}/$(APP_NAME):$(IMAGE_TAG)
+push_image_nextzen:
+	$(DOCKERPUSH) ${NEXTZEN_REGISTRY}/${NEXTZEN_ORG}/$(APP_NAME):$(IMAGE_TAG)
 quick_run:
 	cd $(DEPLOY_PATH)  && \
 	$(DOCKERCOMPOSE) up $(if $(DETACH),--detach)

diff --git a/deploy/docker-compose.yml b/deploy/docker-compose.yml
@@ -7,7 +7,7 @@ services:
       - 10086:10086
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
-      - /var/lib/docker/volumes:/var/lib/docker/volumes:rslave
+      - /var/lib/docker/volumes:/var/lib/docker/volumes
       - /opt:/opt
       - /root:/root
     environment:

diff --git a/frontend/vite.config.ts b/frontend/vite.config.ts
@@ -38,7 +38,7 @@ export default defineConfig(({ mode }: ConfigEnv): UserConfig => {
         server: {
             port: viteEnv.VITE_PORT,
             open: viteEnv.VITE_OPEN,
-            host: '10.0.0.50',
+            host: '172.20.60.244',
             proxy: {
                 '/api/v1': {
                     target: 'http://10.0.0.50:10086/',