Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: bump docker namespace to kcllang. #601

Merged
merged 1 commit into from
Jul 11, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
// README at: https://github.com/devcontainers/templates/tree/main/src/alpine
{
// ref: https://docs.github.com/en/codespaces/setting-up-your-project-for-codespaces/adding-a-dev-container-configuration/introduction-to-dev-containers#dockerfile
"image": "docker.io/kusionstack/kclvm-builder:latest"
"image": "docker.io/kcllang/kcl-builder:latest"
}
42 changes: 20 additions & 22 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,25 +40,23 @@ jobs:
run: export PATH=$PATH:$PWD/_build/dist/ubuntu/kclvm/bin && make build
shell: bash

# KCL docker image build and upload, TODO: bump kusionstack/kclvm to kcl-lang/kcl

# - name: Copy Dockerfile to the current work directory
# run: cp scripts/docker/kclvm/Dockerfile .
# shell: bash
# - name: Login to Docker Hub
# uses: docker/login-action@v2
# with:
# username: ${{ secrets.DOCKERHUB_USERNAME }}
# password: ${{ secrets.DOCKERHUB_TOKEN }}
# - name: Extract metadata (tags, labels) for Docker
# id: meta
# uses: docker/metadata-action@v4
# with:
# images: kusionstack/kclvm
# - name: Build and push Docker image
# uses: docker/build-push-action@v3
# with:
# context: .
# push: ${{ github.event_name != 'pull_request' }}
# tags: ${{ steps.meta.outputs.tags }}
# labels: ${{ steps.meta.outputs.labels }}
- name: Copy Dockerfile to the current work directory
run: cp scripts/docker/kcl/Dockerfile .
shell: bash
- name: Login to Docker Hub
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_PASSWORD }}
- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@v4
with:
images: kcllang/kcl
- name: Build and push Docker image
uses: docker/build-push-action@v3
with:
context: .
push: ${{ github.event_name != 'pull_request' }}
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
2 changes: 1 addition & 1 deletion .github/workflows/ubuntu_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jobs:
name: Test
runs-on: ubuntu-latest
container:
image: kusionstack/kclvm-builder
image: kcllang/kcl-builder
steps:
- name: Check out code
uses: actions/checkout@v3
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ PROJECT_NAME = KCLVM
PWD:=$(shell pwd)

KCLVM_VERSION := $(shell cat VERSION)
BUILD_IMAGE:=kusionstack/kclvm-builder
BUILD_IMAGE:=kcllang/kcl-builder

# export DOCKER_DEFAULT_PLATFORM=linux/amd64
# or
Expand Down
2 changes: 1 addition & 1 deletion docs/dev_guide/2.quick_start.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Before asking a question, make sure you have:
- [KCL GitHub Issues](https://github.com/kcl-lang/kcl/issues?utf8=%E2%9C%93&q=is%3Aissue)

- Read the documentations:
- [KCL Documents](https://kusionstack.io/docs/reference/lang/lang/tour)
- [KCL Documents](https://kcl-lang.io/docs/reference/lang/tour)
- [KCL Readme](https://github.com/kcl-lang/kcl)

If you have any questions about `KCL`, you are welcome to ask your questions in [KCL Github Issues](https://github.com/kcl-lang/kcl/issues). When you ask a question, please describe the details as clearly as possible so that others in the KCL community can understand, and you *MUST* be polite and avoid personal attack and avoid not objective comparison with other projects.
Expand Down
2 changes: 1 addition & 1 deletion internal/scripts/cli/kcl-test
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

kcl_go_path=$(cd `dirname $0`; pwd)/kcl-go
if [[ ! -f $kcl_go_path ]]; then
echo "kcl-go not found, please check the installation at https://github.com/KusionStack/kclvm-go"
echo "kcl-go not found, please check the installation at https://github.com/kcl-lang/kcl-go"
exit 1
fi
export PYTHONPATH=''
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

PWD:=$(shell pwd)

BUILDER_IMAGE:=kusionstack/kclvm-builder
BUILDER_IMAGE:=kcllang/kcl-builder:centos7

# export DOCKER_DEFAULT_PLATFORM=linux/amd64
# or
Expand All @@ -13,15 +13,15 @@ RUN_IN_DOCKER+=-v ~/.ssh:/root/.ssh
RUN_IN_DOCKER+=-v ~/.gitconfig:/root/.gitconfig
RUN_IN_DOCKER+=-v ~/go/pkg/mod:/go/pkg/mod

kclvm-builder:
kcl-builder:
docker build --platform linux/amd64 -t ${BUILDER_IMAGE} .
@echo "ok"

publish-builder:
# https://docker.inc.com/
# docker login --username=

# make kclvm-builder
# make kcl-builder
docker push ${BUILDER_IMAGE}
@echo "push ${BUILDER_IMAGE} ok"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

PWD:=$(shell pwd)

BUILDER_IMAGE:=kusionstack/kclvm-builder:centos8
BUILDER_IMAGE:=kcllang/kcl-builder:centos8

# export DOCKER_DEFAULT_PLATFORM=linux/amd64
# or
Expand All @@ -13,15 +13,15 @@ RUN_IN_DOCKER+=-v ~/.ssh:/root/.ssh
RUN_IN_DOCKER+=-v ~/.gitconfig:/root/.gitconfig
RUN_IN_DOCKER+=-v ~/go/pkg/mod:/go/pkg/mod

kclvm-builder:
kcl-builder:
docker build --platform linux/amd64 -t ${BUILDER_IMAGE} .
@echo "ok"

publish-builder:
# https://docker.inc.com/
# docker login --username=

# make kclvm-builder
# make kcl-builder
docker push ${BUILDER_IMAGE}
@echo "push ${BUILDER_IMAGE} ok"

Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
# Copyright 2021 The KCL Authors. All rights reserved.

PWD:=$(shell pwd)
TIMESTAMP:=$(shell go run timestamp.go)

BUILDER_IMAGE:=kusionstack/kclvm-builder:centos7
BUILDER_IMAGE:=kcllang/kcl-builder

# export DOCKER_DEFAULT_PLATFORM=linux/amd64
# or
Expand All @@ -14,15 +13,15 @@ RUN_IN_DOCKER+=-v ~/.ssh:/root/.ssh
RUN_IN_DOCKER+=-v ~/.gitconfig:/root/.gitconfig
RUN_IN_DOCKER+=-v ~/go/pkg/mod:/go/pkg/mod

kclvm-builder:
kcl-builder:
docker build --platform linux/amd64 -t ${BUILDER_IMAGE} .
@echo "ok"

publish-builder:
# https://docker.inc.com/
# docker login --username=

# make kclvm-builder
# make kcl-builder
docker push ${BUILDER_IMAGE}
@echo "push ${BUILDER_IMAGE} ok"

Expand Down
File renamed without changes.
20 changes: 0 additions & 20 deletions scripts/docker/kclvm-builder-centos7/timestamp.go

This file was deleted.

Empty file removed scripts/docker/kclvm/.keep
Empty file.
Loading