Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev Update Dockerfile & http coroutine feature #34

Merged
merged 7 commits into from
Mar 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-latest, arch-latest, macOS-latest, windows-latest]
os: [ubuntu-latest, macOS-latest, windows-latest]
steps:
- uses: actions/checkout@v3
- name: Building squick third party library for linux and macos
if: matrix.os == 'ubuntu-latest' || matrix.os == 'arch-latest' || matrix.os == 'macOS-latest'
if: matrix.os == 'ubuntu-latest' || matrix.os == 'macOS-latest'
run: |
cd tools && ./build_third_party.sh

Expand All @@ -22,7 +22,7 @@ jobs:
.\clone_thirdparty_build.bat

- name: Building sqkctl tools for linux and macos
if: matrix.os == 'ubuntu-latest' || matrix.os == 'arch-latest' || matrix.os == 'macOS-latest'
if: matrix.os == 'ubuntu-latest' || matrix.os == 'macOS-latest'
run: |
cd tools && ./build_sqkctl.sh

Expand All @@ -33,7 +33,7 @@ jobs:
.\build_sqkctl.bat

- name: Building squick project for linux and macos
if: matrix.os == 'ubuntu-latest' || matrix.os == 'arch-latest' || matrix.os == 'macOS-latest'
if: matrix.os == 'ubuntu-latest' || matrix.os == 'macOS-latest'
run: |
cd tools && ./build_squick.sh

Expand All @@ -44,12 +44,16 @@ jobs:
.\build_squick.bat

- name: Geneating deploy files for linux and macos
if: matrix.os == 'ubuntu-latest' || matrix.os == 'arch-latest' || matrix.os == 'macOS-latest'
if: matrix.os == 'ubuntu-latest' || matrix.os == 'macOS-latest'
run: |
cd tools && ./generate_deploy.sh

cd ../deploy
ls -al

- name: Geneating deploy files for windows
if: matrix.os == 'windows-latest'
run: |
cd tools
.\generate_deploy.bat
.\generate_deploy.bat
cd ..\deploy
dir
Empty file added docker/debug
Empty file.
18 changes: 0 additions & 18 deletions docker/deploy/Dockerfile

This file was deleted.

107 changes: 0 additions & 107 deletions docker/deploy/single.yml

This file was deleted.

20 changes: 0 additions & 20 deletions docker/dev/Dockerfile

This file was deleted.

19 changes: 0 additions & 19 deletions docker/dev/build/Dockerfile

This file was deleted.

10 changes: 0 additions & 10 deletions docker/dev/dk_create.sh

This file was deleted.

6 changes: 0 additions & 6 deletions docker/dev/dk_rebuild_all.sh

This file was deleted.

6 changes: 0 additions & 6 deletions docker/dev/dk_reload.sh

This file was deleted.

8 changes: 0 additions & 8 deletions docker/dev/rebuild.sh

This file was deleted.

3 changes: 0 additions & 3 deletions docker/dev/service.sh

This file was deleted.

25 changes: 0 additions & 25 deletions docker/mysql/conf/my.conf

This file was deleted.

17 changes: 0 additions & 17 deletions docker/mysql/create.sh

This file was deleted.

17 changes: 17 additions & 0 deletions docker/release
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# cd {squick_project}
# docker build . -t i0gan/squick_src:1.1 -f ./docker/src
# docker run -d --name squick_src i0gan/squick_src:1.1
# rm -rf ./cache/docker_deploy
# docker cp squick_src:/squick/deploy ./cache/docker_deploy

# docker build . -t i0gan/squick:1.1 -f ./docker/release
# docker run -it --name squick i0gan/squick:1.1

FROM ubuntu:22.04
# Set env
ARG DEBIAN_FRONTEND=noninteractive

# copy from docker builded files
COPY ./cache/docker_deploy /squick
WORKDIR /squick
CMD cd /squick && bash ./single_start.sh
18 changes: 0 additions & 18 deletions docker/runtime/Dockerfile

This file was deleted.

11 changes: 0 additions & 11 deletions docker/runtime/dk_create.sh

This file was deleted.

2 changes: 0 additions & 2 deletions docker/runtime/service.sh

This file was deleted.

20 changes: 20 additions & 0 deletions docker/single.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
version: '3.5'
services:
master:
build:
context: .
image: i0gan/squick:1.1
user: root
restart: always
ports:
- 80:4000
environment:
- UPLOAD_FOLDER=/var/uploads
networks:
default:
internal:

networks:
default:
internal:
internal: true
Loading
Loading