Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
gitlab-ci-cd
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
JetBrains YouTrack
External wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
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
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Prosper
gitlab-ci-cd
Commits
04c10c74
Commit
04c10c74
authored
2 years ago
by
Griefed
Browse files
Options
Downloads
Patches
Plain Diff
Update Dockerfile
parent
ea35db26
No related branches found
Tags
bionic-20ac8175-ls15
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
Dockerfile
+0
-4
0 additions, 4 deletions
Dockerfile
with
0 additions
and
4 deletions
Dockerfile
+
0
−
4
View file @
04c10c74
...
@@ -72,11 +72,7 @@ RUN \
...
@@ -72,11 +72,7 @@ RUN \
npm
install
-g
\
npm
install
-g
\
@quasar/cli
&&
\
@quasar/cli
&&
\
echo
"**** Installing act ****"
&&
\
echo
"**** Installing act ****"
&&
\
<<<<<<
< HEAD
curl https://raw.githubusercontent.com/nektos/act/b23bbefc365012886192e477a88d38a0909ecba1/install.sh | sudo bash && \
=======
curl https://raw.githubusercontent.com/nektos/act/b23bbefc365012886192e477a88d38a0909ecba1/install.sh | bash
&&
\
curl https://raw.githubusercontent.com/nektos/act/b23bbefc365012886192e477a88d38a0909ecba1/install.sh | bash
&&
\
>>>>>>> 209e392b842f6e294c372a52a55b65b3bcb205a3
echo
"**** Cleanup ****"
&&
\
echo
"**** Cleanup ****"
&&
\
rm
-rf
\
rm
-rf
\
/var/cache/apk/
*
\
/var/cache/apk/
*
\
...
...
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