mirror of
https://github.com/tgbot-collection/YYeTsBot.git
synced 2025-11-24 19:12:53 +08:00
get rid of sub module
This commit is contained in:
8
.github/workflows/docker.yaml
vendored
8
.github/workflows/docker.yaml
vendored
@@ -43,14 +43,6 @@ jobs:
|
||||
username: ${{ github.repository_owner }}
|
||||
password: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
||||
- name: Run hooks
|
||||
env:
|
||||
REACT_APP_DOMAIN: ${{ secrets.REACT_APP_DOMAIN }}
|
||||
REACT_APP_GA: ${{ secrets.REACT_APP_GA }}
|
||||
GENERATE_SOURCEMAP: ${{ secrets.GENERATE_SOURCEMAP }}
|
||||
REACT_APP_ADSENSE: ${{ secrets.REACT_APP_ADSENSE }}
|
||||
run: bash scripts/pre_build.sh
|
||||
|
||||
- name: Lower case for Docker Hub
|
||||
id: dh_string
|
||||
uses: ASzc/change-string-case-action@v5
|
||||
|
||||
3
.gitmodules
vendored
3
.gitmodules
vendored
@@ -1,3 +0,0 @@
|
||||
[submodule "YYeTsFE"]
|
||||
path = YYeTsFE
|
||||
url = https://github.com/tgbot-collection/YYeTsFE
|
||||
23
Dockerfile
23
Dockerfile
@@ -1,4 +1,4 @@
|
||||
FROM python:3.12-alpine as pybuilder
|
||||
FROM python:3.12-alpine AS pybuilder
|
||||
RUN apk update && apk add --no-cache tzdata ca-certificates alpine-sdk libressl-dev libffi-dev cargo && \
|
||||
apk add tiff-dev jpeg-dev openjpeg-dev zlib-dev freetype-dev lcms2-dev \
|
||||
libwebp-dev tcl-dev tk-dev harfbuzz-dev fribidi-dev libimagequant-dev libxcb-dev libpng-dev
|
||||
@@ -7,23 +7,14 @@ COPY requirements.txt /requirements.txt
|
||||
RUN pip3 install --user -r /requirements.txt && rm /requirements.txt
|
||||
|
||||
|
||||
FROM python:3.12-alpine as runner
|
||||
FROM python:3.12-alpine AS runner
|
||||
RUN apk update && apk add --no-cache libressl jpeg-dev openjpeg-dev libimagequant-dev tiff-dev freetype-dev libxcb-dev
|
||||
|
||||
|
||||
FROM node:20-alpine as nodebuilder
|
||||
WORKDIR /YYeTsBot/YYeTsFE/
|
||||
ENV NODE_OPTIONS=--openssl-legacy-provider
|
||||
ARG env
|
||||
RUN apk add git
|
||||
COPY YYeTsFE/package.json /YYeTsBot/YYeTsFE/
|
||||
COPY YYeTsFE/yarn.lock /YYeTsBot/YYeTsFE/
|
||||
COPY scripts/dev_robots.sh /tmp/
|
||||
RUN yarn --network-timeout 1000000
|
||||
COPY YYeTsFE /YYeTsBot/YYeTsFE/
|
||||
COPY .git /YYeTsBot/.git/
|
||||
RUN if [ "$env" = "dev" ]; then echo "dev build"; yarn build; sh /tmp/dev_robots.sh; else echo "prod build"; yarn run release; fi
|
||||
|
||||
FROM alpine AS nodebuilder
|
||||
RUN apk add curl jq
|
||||
RUN wget $(curl -s https://api.github.com/repos/tgbot-collection/YYeTsFE/releases/latest | jq -r '.assets[] | select(.name == "build.zip") | .browser_download_url')
|
||||
RUN unzip build.zip && rm build.zip
|
||||
|
||||
FROM runner
|
||||
RUN apk add mongodb-tools mysql-client
|
||||
@@ -32,7 +23,7 @@ COPY . /YYeTsBot
|
||||
COPY --from=pybuilder /root/.local /usr/local
|
||||
COPY --from=pybuilder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
|
||||
COPY --from=pybuilder /usr/share/zoneinfo /usr/share/zoneinfo
|
||||
COPY --from=nodebuilder /YYeTsBot/YYeTsFE/build /YYeTsBot/yyetsweb/templates/
|
||||
COPY --from=nodebuilder /build /YYeTsBot/yyetsweb/templates/
|
||||
|
||||
ENV TZ=Asia/Shanghai
|
||||
WORKDIR /YYeTsBot/yyetsbot
|
||||
|
||||
1
YYeTsFE
1
YYeTsFE
Submodule YYeTsFE deleted from 5807eba2b8
@@ -1,4 +0,0 @@
|
||||
cat << EOF > /YYeTsBot/YYeTsFE/build/robots.txt
|
||||
User-agent: *
|
||||
Disallow: /
|
||||
EOF
|
||||
@@ -1,8 +0,0 @@
|
||||
#!/bin/bash
|
||||
cat << EOF >> YYeTsFE/.env
|
||||
REACT_APP_DOMAIN=$REACT_APP_DOMAIN
|
||||
REACT_APP_GA=$REACT_APP_GA
|
||||
# sourcemap
|
||||
GENERATE_SOURCEMAP=$GENERATE_SOURCEMAP
|
||||
REACT_APP_ADSENSE=$REACT_APP_ADSENSE
|
||||
EOF
|
||||
Reference in New Issue
Block a user