Verified Commit 7b4d50d0 authored by Grégor JOUET's avatar Grégor JOUET 🔧
Browse files

Update CI/CD

parent 2c0bc82d

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -20,5 +20,5 @@ deploy: 
    - echo "$MUSKRAT_SSH_KNOWN_HOSTS" > ~/.ssh/known_hosts

    - chmod 644 ~/.ssh/known_hosts

  script:

    - ssh $MUSKRAT_DEPLOY_USER@$MUSKRAT_DEPLOY_HOST "cd '/data/live/myfab'; ls; sudo -E ./restart.sh"

    - ssh $MUSKRAT_DEPLOY_USER@$MUSKRAT_DEPLOY_HOST "cd '/data/live/myfab'; sudo -E ./restart.sh"

back/myfab/api.py

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ app = Flask(__name__) 
CORS(app)



JWT_PATH = (

    os.environ["JWT_PATH"] if "JWT_PATH" in os.environ else "../ci/jwt_public.pem"

    os.environ["JWT_PATH"] if "JWT_PATH" in os.environ else "/jwt_public.pem"

)

with open(JWT_PATH) as fh:

    app.config["JWT_PUBLIC_KEY"] = fh.read()

ci/Dockerfile

+3 −1
Original line number Diff line number Diff line
@@ -21,7 +21,9 @@ RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \ 


ADD ci/nginx.conf /etc/nginx

RUN nginx -t

ADD ci/jwt_public.pem /

ADD ci/start.sh /

COPY --from=api /app/back /app/back

COPY --from=front /app/ui /app/ui



CMD /app/ci/start.sh
 
 No newline at end of file
 
CMD /start.sh
 
 No newline at end of file