diff --git a/docker-compose.yml b/docker-compose.yml index f1caef3..3acc36b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,6 +1,8 @@ services: curry_addiction_nginx: - image: nginx:latest + build: + context: . + dockerfile: ./docker/nginx/Dockerfile container_name: curry_addiction_nginx volumes: - ./docker/nginx/default.conf:/etc/nginx/conf.d/default.conf diff --git a/docker/nginx/Dockerfile b/docker/nginx/Dockerfile index 81e2296..9d65bed 100644 --- a/docker/nginx/Dockerfile +++ b/docker/nginx/Dockerfile @@ -2,8 +2,9 @@ FROM nginx:1.27-alpine ENV TZ=Asia/Tokyo -RUN echo "${TZ}" > /etc/timezone \ - && dpkg-reconfigure -f noninteractive tzdata +RUN apk add --no-cache tzdata \ + && cp /usr/share/zoneinfo/Asia/Tokyo /etc/localtime \ + && echo "Asia/Tokyo" > /etc/timezone # nginx config file COPY ./docker/nginx/*.conf /etc/nginx/conf.d/ diff --git a/frontend-user/src/views/pages/Dashboard/Setting/Index.vue b/frontend-user/src/views/pages/Dashboard/Setting/Index.vue index 0dbe47b..d1c92eb 100644 --- a/frontend-user/src/views/pages/Dashboard/Setting/Index.vue +++ b/frontend-user/src/views/pages/Dashboard/Setting/Index.vue @@ -1,5 +1,6 @@