Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
b721b068
Commit
b721b068
authored
Nov 09, 2020
by
Marcel van Remmerden
Committed by
Ash McKenzie
Nov 17, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove static configuration for Gitpod GDK
parent
1d54afb2
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
.gitpod.yml
.gitpod.yml
+1
-3
config/webpack.config.js
config/webpack.config.js
+2
-0
No files found.
.gitpod.yml
View file @
b721b068
...
...
@@ -15,9 +15,6 @@ tasks:
cd /workspace/gitlab-development-kit
[[ ! -L /workspace/gitlab-development-kit/gitlab ]] && ln -fs /workspace/gitlab /workspace/gitlab-development-kit/gitlab
mv /workspace/gitlab-development-kit/secrets.yml /workspace/gitlab-development-kit/gitlab/config
# make webpack static, prevents that GitLab tries to connect to localhost webpack from browser outside the workspace
echo "webpack:" >> gdk.yml
echo " static: true" >> gdk.yml
# reconfigure GDK
echo "$(date) – Reconfiguring GDK" | tee -a /workspace/startup.log
gdk reconfigure
...
...
@@ -43,6 +40,7 @@ tasks:
fi
# start GDK
echo "$(date) – Starting GDK" | tee -a /workspace/startup.log
export DEV_SERVER_PUBLIC_ADDR=$(gp url 3808)
export RAILS_HOSTS=$(gp url 3000 | sed -e 's+^http[s]*://++')
gdk start
# Run DB migrations
...
...
config/webpack.config.js
View file @
b721b068
...
...
@@ -18,6 +18,7 @@ const IS_DEV_SERVER = process.env.WEBPACK_DEV_SERVER === 'true';
const
IS_EE
=
require
(
'
./helpers/is_ee_env
'
);
const
DEV_SERVER_HOST
=
process
.
env
.
DEV_SERVER_HOST
||
'
localhost
'
;
const
DEV_SERVER_PORT
=
parseInt
(
process
.
env
.
DEV_SERVER_PORT
,
10
)
||
3808
;
const
DEV_SERVER_PUBLIC_ADDR
=
process
.
env
.
DEV_SERVER_PUBLIC_ADDR
;
const
DEV_SERVER_HTTPS
=
process
.
env
.
DEV_SERVER_HTTPS
&&
process
.
env
.
DEV_SERVER_HTTPS
!==
'
false
'
;
const
DEV_SERVER_LIVERELOAD
=
IS_DEV_SERVER
&&
process
.
env
.
DEV_SERVER_LIVERELOAD
!==
'
false
'
;
const
WEBPACK_REPORT
=
process
.
env
.
WEBPACK_REPORT
&&
process
.
env
.
WEBPACK_REPORT
!==
'
false
'
;
...
...
@@ -554,6 +555,7 @@ module.exports = {
devServer
:
{
host
:
DEV_SERVER_HOST
,
port
:
DEV_SERVER_PORT
,
public
:
DEV_SERVER_PUBLIC_ADDR
,
https
:
DEV_SERVER_HTTPS
,
headers
:
{
'
Access-Control-Allow-Origin
'
:
'
*
'
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment