Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
bitmask-vpn
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
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
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Julian Merlin
bitmask-vpn
Commits
48ec15f3
Unverified
Commit
48ec15f3
authored
4 years ago
by
Kali Kaneko
Browse files
Options
Downloads
Patches
Plain Diff
[pkg] add package_in_docker targets
parent
283a8e66
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
Makefile
+9
-0
9 additions, 0 deletions
Makefile
docker/README.md
+1
-0
1 addition, 0 deletions
docker/README.md
docker/builder.sh
+1
-1
1 addition, 1 deletion
docker/builder.sh
with
11 additions
and
1 deletion
Makefile
+
9
−
0
View file @
48ec15f3
...
...
@@ -206,8 +206,17 @@ prepare_done:
# packaging action
#########################################################################
builder_image
:
@
make
-C
docker build
packages
:
package_deb package_snap package_osx package_win
package_snap_in_docker
:
@
make
-C
docker package_snap
package_win_in_docker
:
@
make
-C
docker package_win
package_snap
:
@
make
-C
build/
${
PROVIDER
}
pkg_snap
...
...
This diff is collapsed.
Click to expand it.
docker/README.md
+
1
−
0
View file @
48ec15f3
You can use the makefile to build the image.
"make packages" will build packages inside the builder container.
Use https://github.com/kalikaneko/squid-in-a-can if you want to save some bandwith while building your images.
This diff is collapsed.
Click to expand it.
docker/builder.sh
+
1
−
1
View file @
48ec15f3
...
...
@@ -12,7 +12,7 @@ case $TYPE in
echo
"[+] Building SNAP"
make package_snap
;;
default
)
*
)
make build
;;
esac
...
...
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