Добавлена сборка через Docker
This commit is contained in:
parent
e3b935d1c6
commit
39126ce572
9 changed files with 71 additions and 95 deletions
10
.woodpecker.yaml
Normal file
10
.woodpecker.yaml
Normal file
|
|
@ -0,0 +1,10 @@
|
|||
pipeline:
|
||||
build:
|
||||
image: plugins/docker
|
||||
settings:
|
||||
registry: gitrepo.ru
|
||||
username: neonxp
|
||||
password:
|
||||
from_secret: gitea_token
|
||||
repo: gitrepo.ru/neonxp/nquest
|
||||
tags: latest
|
||||
37
Dockerfile
Normal file
37
Dockerfile
Normal file
|
|
@ -0,0 +1,37 @@
|
|||
# Build frontend
|
||||
FROM node:21-alpine3.17 as frontend
|
||||
WORKDIR /app
|
||||
COPY ./frontend /app
|
||||
RUN npm install && npm run build
|
||||
|
||||
# Build backend
|
||||
FROM golang:1.21.3-alpine3.17 as backend
|
||||
WORKDIR /app
|
||||
RUN apk update --no-cache && apk add --no-cache tzdata
|
||||
COPY go.mod go.sum ./
|
||||
RUN go mod download && go mod verify
|
||||
COPY . .
|
||||
COPY --from=frontend /app/dist /app/frontend/dist
|
||||
RUN go build -v -o nquest *.go
|
||||
|
||||
# Runtime container
|
||||
FROM alpine:3.17
|
||||
WORKDIR /app
|
||||
RUN apk update --no-cache && apk add --no-cache ca-certificates
|
||||
|
||||
COPY --from=backend /usr/share/zoneinfo/Europe/Moscow /usr/share/zoneinfo/Europe/Moscow
|
||||
COPY --from=backend /app/nquest /app/nquest
|
||||
|
||||
ENV TZ Europe/Moscow
|
||||
|
||||
ENV PG_HOST nquestdb
|
||||
ENV PG_NAME nquest
|
||||
ENV PG_USER nquest
|
||||
ENV PG_PASS nquest
|
||||
ENV PG_PORT 5432
|
||||
ENV SECRET s3cr3t
|
||||
ENV LISTEN :8000
|
||||
|
||||
EXPOSE 8000
|
||||
|
||||
CMD ["/app/nquest"]
|
||||
8
Makefile
8
Makefile
|
|
@ -6,3 +6,11 @@ db:
|
|||
gen-api:
|
||||
oapi-codegen -generate server,spec -package api -o api/server.go api/openapi.yaml
|
||||
oapi-codegen -generate types -package api -o api/types.go api/openapi.yaml
|
||||
|
||||
.PHONY: build-front
|
||||
build-front:
|
||||
cd frontend & npm run
|
||||
|
||||
.PHONY: dev-front
|
||||
dev-front:
|
||||
cd frontend & npm run dev
|
||||
2
frontend/.gitignore
vendored
2
frontend/.gitignore
vendored
|
|
@ -1 +1,3 @@
|
|||
node_modules
|
||||
dist
|
||||
!dist/.gitkeep
|
||||
67
frontend/dist/assets/index-7c896ee4.js
vendored
67
frontend/dist/assets/index-7c896ee4.js
vendored
File diff suppressed because one or more lines are too long
11
frontend/dist/assets/index-dca32c5e.css
vendored
11
frontend/dist/assets/index-dca32c5e.css
vendored
File diff suppressed because one or more lines are too long
14
frontend/dist/index.html
vendored
14
frontend/dist/index.html
vendored
|
|
@ -1,14 +0,0 @@
|
|||
<!doctype html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="UTF-8" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||
<title>nQuest</title>
|
||||
<script type="module" crossorigin src="/assets/index-7c896ee4.js"></script>
|
||||
<link rel="stylesheet" href="/assets/index-dca32c5e.css">
|
||||
</head>
|
||||
<body data-bs-theme="dark">
|
||||
<div id="root"></div>
|
||||
|
||||
</body>
|
||||
</html>
|
||||
1
frontend/dist/vite.svg
vendored
1
frontend/dist/vite.svg
vendored
|
|
@ -1 +0,0 @@
|
|||
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="31.88" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 257"><defs><linearGradient id="IconifyId1813088fe1fbc01fb466" x1="-.828%" x2="57.636%" y1="7.652%" y2="78.411%"><stop offset="0%" stop-color="#41D1FF"></stop><stop offset="100%" stop-color="#BD34FE"></stop></linearGradient><linearGradient id="IconifyId1813088fe1fbc01fb467" x1="43.376%" x2="50.316%" y1="2.242%" y2="89.03%"><stop offset="0%" stop-color="#FFEA83"></stop><stop offset="8.333%" stop-color="#FFDD35"></stop><stop offset="100%" stop-color="#FFA800"></stop></linearGradient></defs><path fill="url(#IconifyId1813088fe1fbc01fb466)" d="M255.153 37.938L134.897 252.976c-2.483 4.44-8.862 4.466-11.382.048L.875 37.958c-2.746-4.814 1.371-10.646 6.827-9.67l120.385 21.517a6.537 6.537 0 0 0 2.322-.004l117.867-21.483c5.438-.991 9.574 4.796 6.877 9.62Z"></path><path fill="url(#IconifyId1813088fe1fbc01fb467)" d="M185.432.063L96.44 17.501a3.268 3.268 0 0 0-2.634 3.014l-5.474 92.456a3.268 3.268 0 0 0 3.997 3.378l24.777-5.718c2.318-.535 4.413 1.507 3.936 3.838l-7.361 36.047c-.495 2.426 1.782 4.5 4.151 3.78l15.304-4.649c2.372-.72 4.652 1.36 4.15 3.788l-11.698 56.621c-.732 3.542 3.979 5.473 5.943 2.437l1.313-2.028l72.516-144.72c1.215-2.423-.88-5.186-3.54-4.672l-25.505 4.922c-2.396.462-4.435-1.77-3.759-4.114l16.646-57.705c.677-2.35-1.37-4.583-3.769-4.113Z"></path></svg>
|
||||
|
Before Width: | Height: | Size: 1.5 KiB |
|
|
@ -55,6 +55,18 @@ func (t *Team) PostTeamsTeamIDMembers(ctx echo.Context, teamID int) error {
|
|||
})
|
||||
}
|
||||
|
||||
user := contextlib.GetUser(ctx)
|
||||
if user.Team != nil {
|
||||
if err := t.TeamService.RemoveMember(ctx.Request().Context(), user.Team.Team, user); err != nil {
|
||||
return err
|
||||
}
|
||||
user.Team = nil
|
||||
}
|
||||
|
||||
if err := t.TeamService.Request(ctx.Request().Context(), team, user); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return t.getTeamResponse(ctx, teamID)
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue