mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-06-06 13:14:11 +00:00
Edit files
This commit is contained in:
parent
27c690ba87
commit
7bb4c31ea4
3 changed files with 62 additions and 24 deletions
26
.devcontainer/devcontainer-template.json
Normal file
26
.devcontainer/devcontainer-template.json
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
{
|
||||
"id": "universal",
|
||||
"version": "2.0.1",
|
||||
"name": "Default Linux Universal",
|
||||
"description": "Use or extend the new Ubuntu-based default, large, multi-language universal container for GitHub Codespaces.",
|
||||
"documentationURL": "https://github.com/devcontainers/templates/tree/main/src/universal",
|
||||
"publisher": "Dev Container Spec Maintainers",
|
||||
"licenseURL": "https://github.com/devcontainers/templates/blob/main/LICENSE",
|
||||
"platforms": [
|
||||
"Python",
|
||||
"Node.js",
|
||||
"JavaScript",
|
||||
"TypeScript",
|
||||
"C++",
|
||||
"Java",
|
||||
"C#",
|
||||
".NET Core",
|
||||
"PHP",
|
||||
"Go",
|
||||
"Ruby",
|
||||
"Conda"
|
||||
],
|
||||
"optionalPaths": [
|
||||
".github/*"
|
||||
]
|
||||
}
|
||||
|
|
@ -1,9 +1,7 @@
|
|||
{
|
||||
"image": "mcr.microsoft.com/devcontainers/javascript-node:4-24-trixie",
|
||||
"features": {
|
||||
"ghcr.io/devcontainers/features/docker-in-docker:2": {
|
||||
"moby": "false"
|
||||
}
|
||||
|
||||
},
|
||||
"postCreateCommand": "npm install -g @devcontainers/cli",
|
||||
"customizations": {
|
||||
|
|
@ -19,3 +17,23 @@
|
|||
}
|
||||
}
|
||||
}
|
||||
{
|
||||
"name": "Default Linux Universal",
|
||||
// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
|
||||
"image": "mcr.microsoft.com/devcontainers/universal:6-linux"
|
||||
|
||||
// Features to add to the dev container. More info: https://containers.dev/features.
|
||||
// "features": {},
|
||||
|
||||
// Use 'forwardPorts' to make a list of ports inside the container available locally.
|
||||
// "forwardPorts": [],
|
||||
|
||||
// Use 'postCreateCommand' to run commands after the container is created.
|
||||
"postCreateCommand": "uname -a",
|
||||
|
||||
// Configure tool-specific properties.
|
||||
// "customizations": {},
|
||||
|
||||
// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
|
||||
"remoteUser": "root"
|
||||
}
|
||||
|
|
|
|||
30
.github/workflows/docker.yml
vendored
30
.github/workflows/docker.yml
vendored
|
|
@ -17,45 +17,41 @@ on:
|
|||
jobs:
|
||||
build:
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v6
|
||||
with:
|
||||
submodules: true
|
||||
|
||||
- name: Docker meta
|
||||
id: meta
|
||||
uses: docker/metadata-action@v6
|
||||
env:
|
||||
DOCKER_METADATA_ANNOTATIONS_LEVELS: manifest,index
|
||||
registry: "${{ env.CI_REGISTRY }}"
|
||||
image: "${{ env.CI_IMAGE_NAME }}"
|
||||
with:
|
||||
images: |
|
||||
'$registry/$image'
|
||||
reg.vados.ru/3x-ui
|
||||
ghcr.io/vados-dev/3x-ui
|
||||
tags: |
|
||||
# set latest tag for default branch
|
||||
#type=raw,value=lts,enable={{is_default_branch}}
|
||||
# use custom value instead of git tag
|
||||
type=semver,pattern=v{{version}},value=v0.0.1
|
||||
# use custom value and match part of it
|
||||
type=semver,pattern=v{{version}},value=v0.0.1,match=v(\d.\d.\d)$
|
||||
type=raw,event=tag
|
||||
type=ref,event=branch
|
||||
type=ref,event=tag
|
||||
type=semver,pattern={{version}},value=lats,match=latest$
|
||||
labels: |
|
||||
maintainer=${GITHUB_REPOSITORY_OWNER}
|
||||
org.opencontainers.image.url=$registry/$image
|
||||
maintainer=${github.actor}
|
||||
org.opencontainers.image.url=https://{{steps.meta.outputs.images}}:{{steps.meta.outputs.tags}}
|
||||
org.opencontainers.image.created={{commit_date 'YYYY-MM-DDTHH:mm:ss.SSS[Z]'}}
|
||||
# type=semver,pattern={{version}}
|
||||
|
||||
- name: Set up QEMU
|
||||
uses: docker/setup-qemu-action@v4
|
||||
|
||||
- name: Set up Docker Buildx
|
||||
uses: docker/setup-buildx-action@v4
|
||||
with:
|
||||
install: true
|
||||
|
||||
- name: Login to registry
|
||||
shell: bash
|
||||
run: |
|
||||
set -euo pipefail
|
||||
echo "reg_url=${{ env.CI_REGISTRY }}"
|
||||
echo "reg_url=${CI_REGISTRY}"
|
||||
echo "reg_user=${{ vars.REG_USER }}"
|
||||
echo "${{ secrets.REG_PASS }}" | docker login "${reg_url}" -u "${reg_user}" --password-stdin
|
||||
|
||||
|
|
@ -65,10 +61,8 @@ jobs:
|
|||
context: .
|
||||
push: true
|
||||
platforms: linux/amd64
|
||||
# images: ${{ steps.meta.outputs.images }}:${{ steps.meta.outputs.tags }}
|
||||
tags: ${{ steps.meta.outputs.tags }}
|
||||
labels: ${{ steps.meta.outputs.labels }}
|
||||
# annotations: ${{ steps.meta.outputs.annotations }}
|
||||
|
||||
# uses: docker/login-action@v2
|
||||
# with:
|
||||
|
|
|
|||
Loading…
Reference in a new issue