Skip to content
Snippets Groups Projects
Commit 3ff90faa authored by Aydin, Mehmet Can (PG/T - Comp Sci & Elec Eng)'s avatar Aydin, Mehmet Can (PG/T - Comp Sci & Elec Eng)
Browse files

docker compose fixed to one file, some static images deleted and cloud run is updated

parent b48be7f3
No related branches found
No related tags found
No related merge requests found
Showing
with 93 additions and 121 deletions
version: '3'
volumes:
post_mysql:
user_mysql:
services:
user-service:
build: ./user-service
ports:
- "5001:5001"
volumes:
- ./user-service:/user-service
depends_on:
- user-db
networks:
- service-network
user-db:
image: mysql
restart: always
environment:
MYSQL_DATABASE: user
MYSQL_USER: user-service
MYSQL_PASSWORD: pass1234
MYSQL_ROOT_PASSWORD: pass1234
MYSQL_HOST: "%"
volumes:
- user_mysql:/var/lib/mysql
ports:
- 3307:3306
networks:
- service-network
post-service:
build: ./post-service
ports:
- "5002:5002"
volumes:
- ./post-service:/post-service
depends_on:
- post-db
networks:
- service-network
post-db:
image: mysql
restart: always
environment:
MYSQL_DATABASE: post
MYSQL_USER: post-service
MYSQL_PASSWORD: pass1234
MYSQL_ROOT_PASSWORD: pass1234
MYSQL_HOST: "%"
volumes:
- post_mysql:/var/lib/mysql
ports:
- 3308:3306
networks:
- service-network
frontend:
build: ./frontend
ports:
- "5003:5003"
restart: always
volumes:
- ./frontend:/frontend
networks:
- service-network
networks:
service-network:
name: service-network
CONFIGURATION_SETUP="config.DevelopmentConfig" CONFIGURATION_SETUP="config.ProductionConfig"
...@@ -127,6 +127,10 @@ def categories(category = None): ...@@ -127,6 +127,10 @@ def categories(category = None):
image_urls = [] image_urls = []
posts = PostClient.get_posts() posts = PostClient.get_posts()
if posts == 404:
flash('No post found in the category', 'fail')
return render_template('forum/index.html')
for post in posts: for post in posts:
if post['category'] == category: if post['category'] == category:
category_posts.append(post) category_posts.append(post)
...@@ -354,9 +358,10 @@ def display_user(user_id): ...@@ -354,9 +358,10 @@ def display_user(user_id):
user_posts = [] user_posts = []
posts = PostClient.get_posts() posts = PostClient.get_posts()
for post in posts: if posts != 404:
if post['user_id'] == int(response['id']): for post in posts:
user_posts.append(post) if post['user_id'] == int(response['id']):
user_posts.append(post)
content = { content = {
'name': response['full_name'], 'name': response['full_name'],
...@@ -375,9 +380,10 @@ def display_currentuser(): ...@@ -375,9 +380,10 @@ def display_currentuser():
user_posts = [] user_posts = []
posts = PostClient.get_posts() posts = PostClient.get_posts()
for post in posts: if posts != 404:
if post['user_id'] == session['user']['id']: for post in posts:
user_posts.append(post) if post['user_id'] == session['user']['id']:
user_posts.append(post)
form = forms.AccountUpdateForm() form = forms.AccountUpdateForm()
if request.method == "POST": if request.method == "POST":
......
frontend/application/static/images/1984a21b73b88524.jpeg

3.52 KiB

frontend/application/static/images/39d716a66c512499.png

2.14 KiB

frontend/application/static/images/722d7684936cf20d.jpeg

5.75 KiB

frontend/application/static/images/users/4a52b61da594027f.jpg

5.26 KiB

frontend/application/static/images/users/a7674577287ec3b2.jpg

5.26 KiB

frontend/application/static/images/users/e1f20076328bbebd.jpeg

9.29 KiB

frontend/application/static/images/users/e6be63b80a5b9efe.jpeg

3.52 KiB

frontend/application/static/images/users/eda01672470e1477.png

38.7 KiB

services:
frontend:
build:
context: .
dockerfile: Dockerfile
ports:
- "5003:5003"
restart: always
volumes:
- .:/frontend
networks:
- service-network
networks:
service-network:
name: service-network
CONFIGURATION_SETUP="config.DevelopmentConfig" CONFIGURATION_SETUP="config.ProductionConfig"
volumes:
post_mysql:
services:
post-service:
build:
context: .
dockerfile: Dockerfile
ports:
- "5002:5002"
volumes:
- .:/post-service
depends_on:
- post-db
networks:
- service-network
post-db:
image: mysql
restart: always
environment:
MYSQL_DATABASE: post
MYSQL_USER: post-service
MYSQL_PASSWORD: pass1234
MYSQL_ROOT_PASSWORD: pass1234
MYSQL_HOST: "%"
volumes:
- post_mysql:/var/lib/mysql
ports:
- 3308:3306
networks:
- service-network
networks:
service-network:
name: service-network
#!/bin/bash #!/bin/bash
sudo apt-get install dbus-x11 sudo docker-compose build
sudo docker-compose up
# user-service'i başlat
cd user-service
docker-compose build
gnome-terminal -- docker-compose up
cd ..
# post-service'i başlat
cd post-service
docker-compose build
gnome-terminal -- docker-compose up
cd ..
# frontend'i başlat
cd frontend
docker-compose build
gnome-terminal -- docker-compose up
cd ..
\ No newline at end of file
...@@ -7,3 +7,5 @@ sudo mv /usr/local/bin/docker-compose /usr/bin/docker-compose ...@@ -7,3 +7,5 @@ sudo mv /usr/local/bin/docker-compose /usr/bin/docker-compose
sudo chmod +x /usr/bin/docker-compose sudo chmod +x /usr/bin/docker-compose
sudo service docker start sudo service docker start
sudo bash run.sh
CONFIGURATION_SETUP="config.DevelopmentConfig" CONFIGURATION_SETUP="config.ProductionConfig"
...@@ -17,7 +17,6 @@ class User(db.Model, UserMixin): ...@@ -17,7 +17,6 @@ class User(db.Model, UserMixin):
image_url = db.Column(db.String(255), nullable=False) image_url = db.Column(db.String(255), nullable=False)
api_key = db.Column(db.String(255), unique=True, nullable=True) api_key = db.Column(db.String(255), unique=True, nullable=True)
date_added = db.Column(db.DateTime, default=datetime.utcnow) date_added = db.Column(db.DateTime, default=datetime.utcnow)
# date_updated = db.Column(db.DateTime, onupdate=datetime.utcnow)
def encode_api_key(self): def encode_api_key(self):
self.api_key = sha256_crypt.hash(self.email + str(datetime.utcnow)) self.api_key = sha256_crypt.hash(self.email + str(datetime.utcnow))
......
volumes:
user_mysql:
services:
user-service:
build:
context: .
dockerfile: Dockerfile
ports:
- "5001:5001"
volumes:
- .:/user-service
depends_on:
- user-db
networks:
- service-network
user-db:
image: mysql
restart: always
environment:
MYSQL_DATABASE: user
MYSQL_USER: user-service
MYSQL_PASSWORD: pass1234
MYSQL_ROOT_PASSWORD: pass1234
MYSQL_HOST: "%"
volumes:
- user_mysql:/var/lib/mysql
ports:
- 3307:3306
networks:
- service-network
networks:
service-network:
name: service-network
No preview for this file type
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment