20 Commits

Author SHA1 Message Date
mckunda d0a641457d Merge pull request 'dev' (#4) from dev into master
ci/woodpecker/push/default Pipeline was successful
ci/woodpecker/tag/default Pipeline was successful
Reviewed-on: #4
2023-01-30 18:39:54 +00:00
mckunda 112d5b2b3d Merge pull request 'refactor: remove initial data and preamble from data div' (#3) from mckunda into dev
ci/woodpecker/push/default Pipeline was successful
ci/woodpecker/pr/default Pipeline was successful
Reviewed-on: #3
2023-01-30 18:38:06 +00:00
mckunda 9f168828fa Merge branch 'dev' into mckunda
ci/woodpecker/push/default Pipeline was successful
ci/woodpecker/pr/default Pipeline was successful
2023-01-30 18:37:39 +00:00
mckunda 9ad4699d6f Merge pull request 'refactor: prepend time counter date with intro' (#2) from mcpanda into dev
ci/woodpecker/push/default Pipeline was successful
Reviewed-on: #2
2023-01-30 18:37:21 +00:00
mckunda 15865adf1a refactor: remove initial data and preamble from data div
ci/woodpecker/push/default Pipeline was successful
ci/woodpecker/pr/default Pipeline was successful
2023-01-30 21:34:32 +03:00
mckunda 2ef03cd573 chore: update .gitignore 2023-01-30 21:33:18 +03:00
mcpanda 0cf1f856fa refactor: prepend time counter date with intro
ci/woodpecker/push/default Pipeline was successful
ci/woodpecker/pr/default Pipeline was successful
2023-01-30 21:09:30 +03:00
semantic-release-bot 4f761ce5f9 chore(release): 1.0.5 [skip ci]
ci/woodpecker/tag/default Pipeline was successful
## [1.0.5](https://git.mckunda.com/mcpanda/summertime/compare/v1.0.4...v1.0.5) (2023-01-28)

### Bug Fixes

* fix gunicorn.sh ([74841b9](74841b9ebe))
2023-01-28 16:09:43 +00:00
mcpanda 74841b9ebe fix: fix gunicorn.sh
ci/woodpecker/push/default Pipeline was successful
2023-01-28 19:08:53 +03:00
semantic-release-bot c1dc3c554a chore(release): 1.0.4 [skip ci]
ci/woodpecker/tag/default Pipeline was successful
## [1.0.4](https://git.mckunda.com/mcpanda/summertime/compare/v1.0.3...v1.0.4) (2023-01-28)

### Bug Fixes

* **docker:** remove copying requirements.txt inside Dockerfile ([ce62961](ce62961bcf))
2023-01-28 16:04:55 +00:00
mcpanda ce62961bcf fix(docker): remove copying requirements.txt inside Dockerfile
ci/woodpecker/push/default Pipeline was successful
2023-01-28 19:04:11 +03:00
semantic-release-bot 35e4657866 chore(release): 1.0.3 [skip ci]
ci/woodpecker/tag/default Pipeline failed
## [1.0.3](https://git.mckunda.com/mcpanda/summertime/compare/v1.0.2...v1.0.3) (2023-01-28)

### Bug Fixes

* **pip:** remove requirements.txt ([b7632cf](b7632cf966))
2023-01-28 16:02:50 +00:00
mcpanda b7632cf966 fix(pip): remove requirements.txt
ci/woodpecker/push/default Pipeline was successful
now the Dockerfile directly installs flask and gunicorn
2023-01-28 19:00:56 +03:00
semantic-release-bot f9c833133a chore(release): 1.0.2 [skip ci]
ci/woodpecker/tag/default Pipeline failed
## [1.0.2](https://git.mckunda.com/mcpanda/summertime/compare/v1.0.1...v1.0.2) (2023-01-28)

### Bug Fixes

* **pip:** add gunicorn and ints dependencies ([fdd7007](fdd70074b9))
2023-01-28 15:57:13 +00:00
mcpanda fdd70074b9 fix(pip): add gunicorn and ints dependencies
ci/woodpecker/push/default Pipeline was successful
2023-01-28 18:56:16 +03:00
semantic-release-bot 6bb19cf679 chore(release): 1.0.1 [skip ci]
ci/woodpecker/tag/default Pipeline was successful
## [1.0.1](https://git.mckunda.com/mcpanda/summertime/compare/v1.0.0...v1.0.1) (2023-01-28)

### Bug Fixes

* make startup script executable ([9dfa5b6](9dfa5b6a17))
2023-01-28 15:48:03 +00:00
mcpanda 9dfa5b6a17 fix: make startup script executable
ci/woodpecker/push/default Pipeline was successful
2023-01-28 18:40:53 +03:00
mcpanda 65339c4db0 ci: fix ci
ci/woodpecker/push/default Pipeline was successful
2023-01-28 18:04:02 +03:00
mcpanda 7a12b67e2b ci: try fixing semantic-release
ci/woodpecker/push/default Pipeline failed
2023-01-27 23:20:55 +03:00
mcpanda 1ba05a7015 ci(woodpecker): add git credentials
ci/woodpecker/push/default Pipeline was successful
2023-01-27 22:19:45 +03:00
9 changed files with 60 additions and 11 deletions
+2
View File
@@ -1,2 +1,4 @@
__pycache__/ __pycache__/
venv/ venv/
.vscode/
.idea/
+1
View File
@@ -1,3 +1,4 @@
# repositoryUrl: https://git.mckunda.com/mcpanda/summertime.git
branches: branches:
- +([0-9])?(.{+([0-9]),x}).x - +([0-9])?(.{+([0-9]),x}).x
- master - master
+6 -3
View File
@@ -1,6 +1,9 @@
pipeline: pipeline:
release tag: release tag:
image: node image: node
secrets:
- source: git_auth
target: git_credentials
commands: commands:
- yarn global add semantic-release @semantic-release/git @semantic-release/changelog @semantic-release/exec - yarn global add semantic-release @semantic-release/git @semantic-release/changelog @semantic-release/exec
- yarn exec semantic-release - yarn exec semantic-release
@@ -11,11 +14,11 @@ pipeline:
event: event:
- push - push
publish docker image: publish docker image:
image: plugins/kaniko image: banzaicloud/drone-kaniko
settings: settings:
repo: mcpanda/summertime
tags: ${DRONE_TAG##v}
registry: registry.container-registry.svc.cluster.local:5000 registry: registry.container-registry.svc.cluster.local:5000
repo: mcpanda/summertime
tags: ${CI_COMMIT_TAG##v}
when: when:
event: event:
- tag - tag
+5 -3
View File
@@ -1,8 +1,10 @@
FROM python:3.10-alpine FROM python:3.11-alpine
COPY requirements.txt /
RUN pip3 install -r /requirements.txt RUN pip3 install flask gunicorn
COPY . /app COPY . /app
WORKDIR /app WORKDIR /app
RUN chmod +x gunicorn.sh
ENTRYPOINT ["./gunicorn.sh"] ENTRYPOINT ["./gunicorn.sh"]
+41
View File
@@ -0,0 +1,41 @@
## [1.0.5](https://git.mckunda.com/mcpanda/summertime/compare/v1.0.4...v1.0.5) (2023-01-28)
### Bug Fixes
* fix gunicorn.sh ([74841b9](https://git.mckunda.com/mcpanda/summertime/commit/74841b9ebe6dafb400bde87401c0c6743d0307f7))
## [1.0.4](https://git.mckunda.com/mcpanda/summertime/compare/v1.0.3...v1.0.4) (2023-01-28)
### Bug Fixes
* **docker:** remove copying requirements.txt inside Dockerfile ([ce62961](https://git.mckunda.com/mcpanda/summertime/commit/ce62961bcfdd743b7b4aafa67c2694e6f71db5ba))
## [1.0.3](https://git.mckunda.com/mcpanda/summertime/compare/v1.0.2...v1.0.3) (2023-01-28)
### Bug Fixes
* **pip:** remove requirements.txt ([b7632cf](https://git.mckunda.com/mcpanda/summertime/commit/b7632cf96619d272912905efca6eac3ab1d0271a))
## [1.0.2](https://git.mckunda.com/mcpanda/summertime/compare/v1.0.1...v1.0.2) (2023-01-28)
### Bug Fixes
* **pip:** add gunicorn and ints dependencies ([fdd7007](https://git.mckunda.com/mcpanda/summertime/commit/fdd70074b977dcc49824293f30f111daf6699bd2))
## [1.0.1](https://git.mckunda.com/mcpanda/summertime/compare/v1.0.0...v1.0.1) (2023-01-28)
### Bug Fixes
* make startup script executable ([9dfa5b6](https://git.mckunda.com/mcpanda/summertime/commit/9dfa5b6a177762535270925a11cac009d66a51b9))
# 1.0.0 (2023-01-28)
### Features
* init ([4700686](https://git.mckunda.com/mcpanda/summertime/commit/4700686dbf80c746bb057c37a3ba024134e068ae))
+1 -1
View File
@@ -1,2 +1,2 @@
#!/bin/sh #!/bin/sh
gunicorn --chdir app wsgi:app -w 2 --threads 2 -b 0.0.0.0:80 gunicorn wsgi:app -w 2 --threads 2 -b 0.0.0.0:80
BIN
View File
Binary file not shown.
+2 -2
View File
@@ -31,7 +31,7 @@
<body> <body>
<div class="timer_frame"> <div class="timer_frame">
<p id="timer_data" class="timer_data">До лета осталось 14д 3ч 24м 30с</p> <p id="timer_data" class="timer_data"></p>
</div> </div>
</body> </body>
<script> <script>
@@ -45,7 +45,7 @@
let url = "/time"; let url = "/time";
let info = await fetchAsync(url); let info = await fetchAsync(url);
let elem = document.getElementById("timer_data"); let elem = document.getElementById("timer_data");
elem.textContent = "До лета осталось " + info; elem.textContent = info;
setTimeout(updateInfoAsync, 1000) setTimeout(updateInfoAsync, 1000)
} }
+1 -1
View File
@@ -15,4 +15,4 @@ def getTimeBeforeSummer():
m = str((summer_time.seconds % 3600) // 60) m = str((summer_time.seconds % 3600) // 60)
s = str(summer_time.seconds % 60) s = str(summer_time.seconds % 60)
return str(summer_time.days) + ' д ' + h + ' ч ' + m + ' мин ' + s + ' сек' return 'До лета осталось ' + str(summer_time.days) + ' д ' + h + ' ч ' + m + ' мин ' + s + ' сек'