From 44ac1d4bcec213c635d07b95e6a67021eb7978a9 Mon Sep 17 00:00:00 2001
From: L4168 <L4168@student.jamk.fi>
Date: Tue, 25 Jun 2019 10:54:58 +0300
Subject: [PATCH] gitlab-ci
---
.gitlab-ci.yml | 3 +++
src/components/LoginForm.js | 2 --
src/components/RegisterForm.js | 3 ---
3 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3551ebc..e12e782 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,8 +12,11 @@ docker-push:
before_script:
- printf "REACT_APP_URL=%s\n" "$REACT_APP_URL" > .env
- echo "$DOCKERHUB_PASS" | docker login -u "$DOCKERHUB_USER" --password-stdin
+ - docker stop front
+ - docker rm front
script:
- docker build -t overflow2019/frontend:test .
- docker push overflow2019/frontend
+ - docker run --name front -p 80:80 -d overflow2019/frontend:test
after_script:
- docker logout
diff --git a/src/components/LoginForm.js b/src/components/LoginForm.js
index fe34df7..874db93 100644
--- a/src/components/LoginForm.js
+++ b/src/components/LoginForm.js
@@ -93,7 +93,6 @@ export class LoginForm extends React.Component {
name='username'
value={this.state.username}
onChange={this.handleChange}
- required
/>
<br />
<input
@@ -102,7 +101,6 @@ export class LoginForm extends React.Component {
name='password'
value={this.state.password}
onChange={this.handleChange}
- required
/>
<br />
<button type='submit'>login</button>
diff --git a/src/components/RegisterForm.js b/src/components/RegisterForm.js
index b50187d..3cf4100 100644
--- a/src/components/RegisterForm.js
+++ b/src/components/RegisterForm.js
@@ -100,7 +100,6 @@ export class RegisterForm extends React.Component {
name='username'
value={this.state.username}
onChange={this.handleChange}
- required
/>
<br />
<input
@@ -109,7 +108,6 @@ export class RegisterForm extends React.Component {
name='password'
value={this.state.password}
onChange={this.handleChange}
- required
/>
<br />
<input
@@ -118,7 +116,6 @@ export class RegisterForm extends React.Component {
name='password2'
value={this.state.password2}
onChange={this.handleChange}
- required
/>
<br />
<button type='submit'>register</button>
--
GitLab