Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
system_admin
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
telegram-bots
system_admin
Commits
30c12fd7
Unverified
Commit
30c12fd7
authored
5 years ago
by
Pavel Kirilin
Browse files
Options
Downloads
Patches
Plain Diff
Fixed deploy configuration.
Signed-off-by:
Pavel Kirilin
<
win10@list.ru
>
parent
356c7166
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Pipeline
#140
passed
5 years ago
Stage: test
Stage: deploy
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
Makefile
+4
-4
4 additions, 4 deletions
Makefile
docker-compose.prod.yml
+2
-0
2 additions, 0 deletions
docker-compose.prod.yml
docker-compose.yml
+2
-0
2 additions, 0 deletions
docker-compose.yml
systemd/bot_sys_admin.service
+1
-1
1 addition, 1 deletion
systemd/bot_sys_admin.service
with
9 additions
and
5 deletions
Makefile
+
4
−
4
View file @
30c12fd7
...
...
@@ -17,7 +17,7 @@ service: build_service
## Wait until postgres is up
service_wait
:
@
docker
exec
-i
t
telegram_system_bot make wait_resources
@
docker
exec
-i
telegram_system_bot make wait_resources
_run_local
:
@
docker-compose up
-d
...
...
@@ -39,11 +39,11 @@ rm:
@
docker-compose down
-v
## Clean all containers
clean_
service
:
clean_
prod
:
@
docker-compose
-f
docker-compose.prod.yml down
## Remove containers and volumes
rm_
service
:
rm_
prod
:
@
docker-compose
-f
docker-compose.prod.yml down
-v
## Runs PostgreSQL UI. | Database
...
...
@@ -61,7 +61,7 @@ migrations:
## Upgrades database.
migrate
:
@
docker
exec
-i
t
telegram_system_bot alembic upgrade
head
;
@
docker
exec
-i
telegram_system_bot alembic upgrade
head
;
## Waits postgresql to be online
wait_resources
:
...
...
This diff is collapsed.
Click to expand it.
docker-compose.prod.yml
+
2
−
0
View file @
30c12fd7
...
...
@@ -24,6 +24,8 @@ services:
networks
:
-
system_bot_network
command
:
make _run_bot
depends_on
:
-
system_bot_postgres
system_bot_postgres
:
container_name
:
'
system_bot_postgres'
...
...
This diff is collapsed.
Click to expand it.
docker-compose.yml
+
2
−
0
View file @
30c12fd7
...
...
@@ -25,6 +25,8 @@ services:
networks
:
-
dev_system_bot_network
command
:
make _dev_run_bot
depends_on
:
-
system_bot_postgres
system_bot_postgres
:
container_name
:
'
system_bot_postgres'
...
...
This diff is collapsed.
Click to expand it.
systemd/bot_sys_admin.service
+
1
−
1
View file @
30c12fd7
...
...
@@ -7,7 +7,7 @@ Type=simple
User
=
bots
WorkingDirectory
=
/home/bots/repos/system_admin
ExecStart
=
/bin/bash -c 'make prod'
ExecStop
=
/bin/bash -c 'make clean'
ExecStop
=
/bin/bash -c 'make clean
_prod
'
Restart
=
on-abort
[Install]
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment